diff --git a/cypress/tests/functional/CustomBlocks.cy.js b/cypress/tests/functional/CustomBlocks.cy.js
index 426b5f0..f85866d 100644
--- a/cypress/tests/functional/CustomBlocks.cy.js
+++ b/cypress/tests/functional/CustomBlocks.cy.js
@@ -38,9 +38,11 @@ describe('Custom Block Manager plugin tests', function() {
 
 		// FIXME: The settings area has to be reloaded before the new block will appear.a
 		// This click should be unnecessary.
+		cy.reload();
 		cy.get('nav').contains('Settings').click();
 		// Ensure submenu item click despite animation
 		cy.get('nav').contains('Website').click({ force: true });
+		cy.get('button[id="appearance-button"]').click();
 		cy.get('#appearance > .pkpTabs > .pkpTabs__buttons > #appearance-setup-button').click();
 		cy.get('#appearance-setup span:contains("test-custom-block"):first').click();
 		cy.get('#appearance-setup button:contains("Save")').click();
diff --git a/locale/fr_FR/locale.po b/locale/fr/locale.po
similarity index 100%
rename from locale/fr_FR/locale.po
rename to locale/fr/locale.po
diff --git a/locale/nb/locale.po b/locale/nb_NO/locale.po
similarity index 100%
rename from locale/nb/locale.po
rename to locale/nb_NO/locale.po
diff --git a/locale/sr@latin/locale.po b/locale/sr_Latn/locale.po
similarity index 100%
rename from locale/sr@latin/locale.po
rename to locale/sr_Latn/locale.po
diff --git a/locale/zh_CN/locale.po b/locale/zh_Hans/locale.po
similarity index 100%
rename from locale/zh_CN/locale.po
rename to locale/zh_Hans/locale.po