diff --git a/components/Accordion.vue b/components/Accordion.vue
index 65c4c2ef51..f5d7437f7b 100644
--- a/components/Accordion.vue
+++ b/components/Accordion.vue
@@ -1,7 +1,8 @@
 <template>
-  <transition-group class="usa-accordion usa-accordion--bordered" name="benefit-list" tag="div"
-    aria-multiselectable="true">
-      <div v-for="benefit in lifeEventBenefits" :key="`acc-key-${benefit.slug}`" class="break-inside-avoid margin-bottom-2">
+  <transition-group id="acc-id" class="usa-accordion usa-accordion--bordered" name="benefit-list"
+    tag="div" aria-multiselectable="true" aria-live="polite">
+      <div v-for="benefit in lifeEventBenefits" :key="`acc-key-${benefit.slug}`"
+        class="break-inside-avoid margin-bottom-2">
         <h2 :id="`acc-h-${benefit.slug}-${cid}`" class="usa-accordion__heading">
           <button
             ref="accordionButtons"
diff --git a/components/CriteriaChild.vue b/components/CriteriaChild.vue
index c2836d20c3..6992955840 100644
--- a/components/CriteriaChild.vue
+++ b/components/CriteriaChild.vue
@@ -9,7 +9,7 @@
       </label>
     </div>
 
-    <div v-if="type === 'select'" :key="criteriaKey" class="">
+    <div v-if="type === 'select' && values.length >= 7" :key="criteriaKey">
       <label class="usa-label margin-top-0" :for="'criteria-' + criteriaGroupKey + '-' + criteriaKey">{{ label }}</label>
       <select :id="'criteria-' + criteriaGroupKey + '-' + criteriaKey" class="usa-select" :name="'criteria-' + criteriaGroupKey + '-' + criteriaKey"
         @change="updateEligibilitySelected">
@@ -20,6 +20,23 @@
         </option>
       </select>
     </div>
+
+    <div v-if="type === 'select' && values.length < 7">
+        <fieldset class="usa-fieldset">
+          <legend class="usa-legend usa-legend">{{ label }}</legend>
+          <div v-for="option, i in values" :key="option" class="usa-radio shade">
+            <input
+              :id="`criteria-${criteriaGroupKey}-${criteriaKey}-${i}`"
+              class="usa-radio__input"
+              type="radio"
+              :name="criteriaGroupKey + '-' + criteriaKey"
+              :value="option"
+              :checked="(response === option) || (!response && i === 0)"
+              @change="updateEligibilitySelected"/>
+              <label class="usa-radio__label" :for="`criteria-${criteriaGroupKey}-${criteriaKey}-${i}`">{{ option }}</label>
+          </div>
+        </fieldset>
+    </div>
 </div>
 </template>
 <script>
diff --git a/components/Header.vue b/components/Header.vue
index ed634d852b..095feb51fc 100644
--- a/components/Header.vue
+++ b/components/Header.vue
@@ -150,8 +150,8 @@
               </nuxt-link>
             </li>
             <li class="usa-nav__primary-item">
-              <nuxt-link to="/topics" class="usa-nav__link">
-                <span>Benefits by topic</span>
+              <nuxt-link to="/types" class="usa-nav__link">
+                <span>Benefits by type</span>
               </nuxt-link>
             </li>
             <li class="usa-nav__primary-item">
@@ -161,6 +161,11 @@
             </li>
           </ul>
           <div class="usa-nav__secondary">
+            <ul class="usa-nav__secondary-links">
+              <li class="usa-nav__secondary-item">
+                <a href="https://www.usa.gov/phone">1-844-USA-GOV1</a>
+              </li>
+            </ul>
             <form class="usa-search" role="search">
               <label class="usa-sr-only" for="extended-search-field-small">Search small</label>
               <input
diff --git a/components/ShareResults.vue b/components/ShareResults.vue
index dc6ea31b03..006630f56c 100644
--- a/components/ShareResults.vue
+++ b/components/ShareResults.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="margin-bottom-4 print:display-none">
-    <h3>Getting help from a friend?</h3>
+    <h3>Sharing and printing</h3>
     <p class="usa-prose">
       Copy a link to this page with the criteria you
       selected above. Make sure to share it only with
@@ -11,10 +11,11 @@
         <input class="usa-input" type="text" readonly
           aria-label="URL of website with responses saved"
           :value="url" data-position="top"
-          @click="copy"/>
+          @click="copy"
+          @blur="blur"/>
           <span :class="{ 'usa-tooltip__body': true, 'is-set': alert, 'usa-tooltip__body--top':true, 'is-visible': alert }" role="tooltip" :aria-hidden="!alert"
             style="left: 15%; top: -4rem;">
-            URL with responses copied to clipboard
+            Link with my selections is copied
           </span>
         </span>
     </div>
@@ -24,7 +25,7 @@
           role="img">
           <use xlink:href="~/assets/img/sprite.svg#share"/>
         </svg>
-        <span class="text-middle">Share my selections</span>
+        <span class="text-middle">Copy my selections</span>
       </button>
     </div>
     <div class="margin-bottom-1">
@@ -99,9 +100,13 @@ export default {
     }
   },
   methods: {
+    blur () {
+      this.alert = false;
+    },
     async copy () {
       await navigator.clipboard.writeText(this.url);
       this.alert = true;
+      /* istanbul ignore next */
       setTimeout(() => {
         this.alert = false;
       }, 30 * 1000)
diff --git a/content/topics/burial-and-funeral-assistance.md b/content/types/burial-and-funeral-assistance.md
similarity index 100%
rename from content/topics/burial-and-funeral-assistance.md
rename to content/types/burial-and-funeral-assistance.md
diff --git a/content/topics/educational-assistance.md b/content/types/educational-assistance.md
similarity index 100%
rename from content/topics/educational-assistance.md
rename to content/types/educational-assistance.md
diff --git a/content/topics/financial-assistance.md b/content/types/financial-assistance.md
similarity index 100%
rename from content/topics/financial-assistance.md
rename to content/types/financial-assistance.md
diff --git a/content/topics/healthcare.md b/content/types/healthcare.md
similarity index 100%
rename from content/topics/healthcare.md
rename to content/types/healthcare.md
diff --git a/content/topics/housing.md b/content/types/housing.md
similarity index 100%
rename from content/topics/housing.md
rename to content/types/housing.md
diff --git a/content/topics/life-insurance.md b/content/types/life-insurance.md
similarity index 100%
rename from content/topics/life-insurance.md
rename to content/types/life-insurance.md
diff --git a/nuxt.config.js b/nuxt.config.js
index 97841460bf..b9af75f1c3 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -22,14 +22,14 @@ export default {
   target: 'static',
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
-    title: 'Benefits Eligibility Estimator',
+    title: 'Benefit finder',
     htmlAttrs: {
       lang: 'en'
     },
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      { hid: 'description', name: 'description', content: 'Default meta tags are in nuxt.config.js' }
+      { hid: 'description', name: 'description', content: 'Answer a few questions. Review a custom list of potential benefits. Find out how to apply.' }
     ],
     link: [
       { rel: 'icon', type: 'image/x-icon', href: sitePrefix + 'favicon.ico' }
diff --git a/package-lock.json b/package-lock.json
index 8e86867bde..207e9e660e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11207,20 +11207,17 @@
       }
     },
     "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "optional": true,
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
+        "is-glob": "^4.0.1"
       },
       "dependencies": {
         "is-glob": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "optional": true,
           "requires": {
             "is-extglob": "^2.1.0"
           }
@@ -11246,13 +11243,12 @@
       },
       "dependencies": {
         "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
           "dev": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
+            "is-glob": "^4.0.1"
           }
         },
         "is-glob": {
@@ -11379,6 +11375,17 @@
             "path-is-absolute": "^1.0.0",
             "readdirp": "^2.2.1",
             "upath": "^1.1.1"
+          },
+          "dependencies": {
+            "glob-parent": {
+              "version": "5.1.2",
+              "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+              "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+              "dev": true,
+              "requires": {
+                "is-glob": "^4.0.1"
+              }
+            }
           }
         },
         "extend-shallow": {
@@ -11437,20 +11444,17 @@
           }
         },
         "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
+            "is-glob": "^4.0.1"
           },
           "dependencies": {
             "is-glob": {
               "version": "3.1.0",
               "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
               "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
               "requires": {
                 "is-extglob": "^2.1.0"
               }
@@ -17440,11 +17444,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
-    },
     "path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -22064,6 +22063,17 @@
             "path-is-absolute": "^1.0.0",
             "readdirp": "^2.2.1",
             "upath": "^1.1.1"
+          },
+          "dependencies": {
+            "glob-parent": {
+              "version": "5.1.2",
+              "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+              "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+              "optional": true,
+              "requires": {
+                "is-glob": "^4.0.1"
+              }
+            }
           }
         },
         "extend-shallow": {
diff --git a/package.json b/package.json
index be5c461109..b4c7c984f3 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "axios": "^0.21.4",
     "core-js": "^3.18.0",
     "nuxt": "^2.15.8",
+    "glob-parent": ">=5.1.2",
     "prismjs": ">=1.25.0",
     "nth-check": ">=2.0.1"
   },
diff --git a/pages/_slug/index.vue b/pages/_slug/index.vue
index c840ff1962..7d6f9c330a 100644
--- a/pages/_slug/index.vue
+++ b/pages/_slug/index.vue
@@ -34,9 +34,9 @@
         </div>
         <div class="tablet:grid-col-4 desktop:grid-col-3 display-flex flex-align-center margin-y-2 print:display-none">
           <div>
-            <button class="usa-button usa-button--unstyled open-all" @click="openAll">Open All</button>
+            <button class="usa-button usa-button--unstyled open-all" aria-controls="acc-id" @click="openAll">Open All</button>
             /
-            <button class="usa-button usa-button--unstyled close-all" @click="closeAll">Close All</button>
+            <button class="usa-button usa-button--unstyled close-all" aria-controls="acc-id" @click="closeAll">Close All</button>
           </div>
         </div>
         <div class="grid-col margin-y-2 text-right">
@@ -60,55 +60,56 @@
       </div>
 
       <div class="grid-row grid-gap print:display-block">
-        <div class="tablet:grid-col-5 desktop:grid-col-4 desktop:position-sticky desktop:top-1 desktop:height-viewport desktop:overflow-y-auto shade padding-2 radius-md">
-          <h2 class="display-none print:display-block">Eligibility criteria</h2>
-          <div v-if="filter">
-            <div class="margin-bottom-3">
-              Currently viewing
-              <span
-                class="usa-tag bg-secondary display-inline-flex margin-left-05 padding-0 usa-button-group__item">
-                <button
-                  class="usa-tooltip usa-button usa-button--unstyled usa-button--outline usa-button--inverse text-uppercase margin-left-05 border-left border-accent-cool-light padding-x-05 font-sans-3xs"
-                  style="padding: .25rem; text-decoration: none;"
-                  :title="`Remove the ${filter} filter`"
-                  aria-label="Remove this filter"
-                  data-position="top"
-                  @click="clearFilter">
-                  <span class="text-middle">{{ filter }}</span>
-                  <svg
-                    class="usa-icon text-white text-middle"
-                    aria-hidden="true"
-                    focusable="false"
-                    role="img">
-                    <use xlink:href="~/assets/img/sprite.svg#close" />
-                  </svg>
-                </button>
-              </span>
+        <div class="tablet:grid-col-5 desktop:grid-col-4 desktop:position-sticky desktop:top-1 desktop:height-viewport desktop:overflow-y-auto shade radius-md ">
+          <h2 class="padding-left-2">Eligibility criteria</h2>
+          <div>
+            <div v-if="filter">
+              <div class="margin-bottom-3">
+                Currently viewing
+                <span
+                  class="usa-tag bg-secondary display-inline-flex margin-left-05 padding-0 usa-button-group__item">
+                  <button
+                    class="usa-tooltip usa-button usa-button--unstyled usa-button--outline usa-button--inverse text-uppercase margin-left-05 border-left border-accent-cool-light padding-x-05 font-sans-3xs"
+                    style="padding: .25rem; text-decoration: none;"
+                    :title="`Remove the ${filter} filter`"
+                    aria-label="Remove this filter"
+                    data-position="top"
+                    @click="clearFilter">
+                    <span class="text-middle">{{ filter }}</span>
+                    <svg
+                      class="usa-icon text-white text-middle"
+                      aria-hidden="true"
+                      focusable="false"
+                      role="img">
+                      <use xlink:href="~/assets/img/sprite.svg#close" />
+                    </svg>
+                  </button>
+                </span>
+              </div>
             </div>
+            <div class="margin-bottom-4 display-flex print:display-none">
+              <div class="text-primary">
+                <svg class="usa-icon usa-icon--size-3" aria-labelledby="eligibility-section-criteria-icon-title" focusable="false"
+                  role="img">
+                  <title id="eligibility-section-criteria-icon-title">Important information</title>
+                  <use xlink:href="~/assets/img/sprite.svg#priority_high"/>
+                </svg>
+              </div>
+              <div class="font-body-md usa-icon-list">
+                {{ lifeEvent.eligibilityCriteriaDescription }}
+              </div>
+            </div>
+            <CriteriaGroup :life-event-criteria="lifeEvent.eligibilityCriteria" />
+            <share-results @print="openAll()" />
           </div>
-          <div class="margin-bottom-4 print:display-none">
-            <ul class="usa-icon-list usa-icon-list--size-md">
-              <li class="usa-icon-list__item">
-                <div class="usa-icon-list__icon text-primary">
-                  <svg class="usa-icon usa-icon--size-3" aria-hidden="true" focusable="false"
-                    role="img">
-                    <use xlink:href="~/assets/img/sprite.svg#priority_high"/>
-                  </svg>
-                </div>
-                <div class="usa-icon-list__content">
-                  {{ lifeEvent.eligibilityCriteriaDescription }}
-                </div>
-              </li>
-            </ul>
-          </div>
-          <CriteriaGroup :life-event-criteria="lifeEvent.eligibilityCriteria" />
-          <share-results @print="openAll()" />
         </div>
         <div class="tablet:grid-col-7 desktop:grid-col-8 print:display-block">
-          <div class="grid-row grid-gap display-none print:display-block break-before-always">
+          <div class="grid-row grid-gap print:display-block break-before-always">
             <div class="grid-col margin-bottom-3">
               <h2>Benefits</h2>
-              Showing {{ lifeEventBenefits.length }} related benefits sorted by {{ sort }}.
+              <span class="display-none print:display-block">
+                Showing {{ lifeEventBenefits.length }} related benefits sorted by {{ sort }}.
+              </span>
             </div>
           </div>
           <div
@@ -192,6 +193,12 @@ export default {
     this.lifeEvent = lifeEvent;
     this.allLifeEventBenefits = this.lifeEventBenefits = lifeEventBenefits;
   },
+  /* istanbul ignore next */
+  head () {
+    return {
+      title: this.lifeEvent.secondaryHeadline,
+    };
+  },
   computed: {
     lifeEventTitle () {
       return this.lifeEvent.secondaryHeadline;
diff --git a/pages/agencies/_slug/index.vue b/pages/agencies/_slug/index.vue
index 78b6c33f9e..7ca63ff0a1 100644
--- a/pages/agencies/_slug/index.vue
+++ b/pages/agencies/_slug/index.vue
@@ -21,9 +21,9 @@
       <div class="grid-row grid-gap print:display-block">
         <div class="tablet:grid-col margin-bottom-3">
           <div>
-            <button class="usa-button usa-button--unstyled open-all" @click="openAll">Open All</button>
+            <button class="usa-button usa-button--unstyled open-all" aria-controls="acc-id" @click="openAll">Open All</button>
             /
-            <button class="usa-button usa-button--unstyled close-all" @click="closeAll">Close All</button>
+            <button class="usa-button usa-button--unstyled close-all" aria-controls="acc-id" @click="closeAll">Close All</button>
           </div>
         </div>
       </div>
@@ -109,6 +109,11 @@ export default {
       this.agency.related.push(await this.$content("agencies", related).fetch());
     }
   },
+  head () {
+    return {
+      title: this.benefitAgency,
+    };
+  },
   methods: {
     mapLifeEvents (lifeEvents) {
       return lifeEvents.map(le => _.lowerCase(le));
diff --git a/pages/agencies/index.vue b/pages/agencies/index.vue
index 3e15dbdada..b9f95dd593 100644
--- a/pages/agencies/index.vue
+++ b/pages/agencies/index.vue
@@ -67,6 +67,12 @@ export default {
       contentAgencies: {},
     };
   },
+  /* istanbul ignore next */
+  head () {
+    return {
+      title: 'Benefits by agency',
+    };
+  },
   methods: {
     kebabCase: _.kebabCase,
     mapAgencies (agencies) {
diff --git a/pages/topics/_slug/index.vue b/pages/types/_slug/index.vue
similarity index 89%
rename from pages/topics/_slug/index.vue
rename to pages/types/_slug/index.vue
index 4889964885..e32c9f066a 100644
--- a/pages/topics/_slug/index.vue
+++ b/pages/types/_slug/index.vue
@@ -21,9 +21,9 @@
       <div class="grid-row grid-gap print:display-block">
         <div class="tablet:grid-col margin-bottom-3">
           <div>
-            <button class="usa-button usa-button--unstyled open-all" @click="openAll">Open All</button>
+            <button class="usa-button usa-button--unstyled open-all" aria-controls="acc-id" @click="openAll">Open All</button>
             /
-            <button class="usa-button usa-button--unstyled close-all" @click="closeAll">Close All</button>
+            <button class="usa-button usa-button--unstyled close-all" aria-controls="acc-id" @click="closeAll">Close All</button>
           </div>
         </div>
       </div>
@@ -100,15 +100,21 @@ export default {
     const allEligibilityCriteria = (await this.$content("criteria").fetch()).body;
     await this.$store.dispatch("criteria/populate", allEligibilityCriteria);
     // eslint-disable-next-line node/handle-callback-err
-    this.topic = await this.$content("topics", this.$route.params.slug).fetch().catch((err) => {});
+    this.topic = await this.$content("types", this.$route.params.slug).fetch().catch((err) => {});
 
     this.topic.related = [];
     for (const related of (this.topic.relatedKeys || [])) {
-      this.topic.related.push(await this.$content("topics", related).fetch());
+      this.topic.related.push(await this.$content("types", related).fetch());
     }
 
     this.lifeEventBenefits = lifeEventBenefits;
   },
+  /* istanbul ignore next */
+  head () {
+    return {
+      title: this.benefitTopic,
+    };
+  },
   methods: {
     mapLifeEvents (lifeEvents) {
       return lifeEvents.map(le => _.lowerCase(le));
diff --git a/pages/topics/index.vue b/pages/types/index.vue
similarity index 85%
rename from pages/topics/index.vue
rename to pages/types/index.vue
index b52ff0dfe8..f6b3dd745a 100644
--- a/pages/topics/index.vue
+++ b/pages/types/index.vue
@@ -4,7 +4,7 @@
       <div class="grid-row grid-gap">
         <div class="tablet:grid-col-10">
           <h1 class="font-heading-1xl margin-top-0 text-secondary">
-            Benefits by topic
+            Benefits by type
           </h1>
           <p class="usa-intro">
             If you know the specific type of benefit you are looking for, select it below.
@@ -20,7 +20,7 @@
               :key="tag.slug"
               class="usa-card desktop:grid-col-6"
               :aria-label="tag.title">
-              <nuxt-link :to="`/topics/${tag.slug}`" class="display-block height-full margin-x-1" style="text-decoration: none; outline-offset: .25rem;">
+              <nuxt-link :to="`/types/${tag.slug}`" class="display-block height-full margin-x-1" style="text-decoration: none; outline-offset: .25rem;">
                 <Card
                   :card-title="tag.title"
                   card-title-heading-level="h2"
@@ -41,7 +41,7 @@ import _ from 'lodash';
 export default {
   layout: "default",
   async asyncData ({ $content }) {
-    const contentTopics = await $content('topics').fetch();
+    const contentTopics = await $content('types').fetch();
     const topics = {};
     for (const c of contentTopics) {
       topics[_.lowerCase(c.slug)] = c;
@@ -65,6 +65,12 @@ export default {
       topics: {},
     };
   },
+  /* istanbul ignore next */
+  head () {
+    return {
+      title: 'Benefits by type',
+    };
+  },
   methods: {
     mapTags (tags) {
       return tags.map((tag) => {
diff --git a/test/Components/CriteriaChild.spec.js b/test/Components/CriteriaChild.spec.js
index d21cfd5ecd..3bb0bb4c39 100644
--- a/test/Components/CriteriaChild.spec.js
+++ b/test/Components/CriteriaChild.spec.js
@@ -16,7 +16,7 @@ const MOCK_CRITERIA = [
     criteriaKey: "criteriaKey2",
     label: "Benefit criteria label 2.",
     type: "select",
-    values: ["one", "two", "three"],
+    values: ["one", "two", "three", "four", "five", "six", "seven", "eight"],
     criteriaGroupKey: "group2"
   }
 ]
diff --git a/test/Components/ShareResults.spec.js b/test/Components/ShareResults.spec.js
index 9b4cfa4008..b6a0fab0eb 100644
--- a/test/Components/ShareResults.spec.js
+++ b/test/Components/ShareResults.spec.js
@@ -94,6 +94,8 @@ describe('ShareResults', () => {
     await wrapper.vm.copy();
     await wrapper.vm.$nextTick();
     expect(wrapper.find('.usa-tooltip')).toBeDefined();
+    wrapper.vm.blur();
+    await wrapper.vm.$nextTick();
     jest.runAllTimers();
     jest.useRealTimers();
   });
diff --git a/test/pages/topics/_slug/index.spec.js b/test/pages/types/_slug/index.spec.js
similarity index 95%
rename from test/pages/topics/_slug/index.spec.js
rename to test/pages/types/_slug/index.spec.js
index 75fb6bfb25..bf1e41a46e 100644
--- a/test/pages/topics/_slug/index.spec.js
+++ b/test/pages/types/_slug/index.spec.js
@@ -1,8 +1,8 @@
 import { shallowMount } from '@vue/test-utils'
-import Page from '@/pages/topics/_slug/index.vue'
+import Page from '@/pages/types/_slug/index.vue'
 import beforeAllTests from '@/test/beforeAllTests';
 
-describe('pages/topics/_slug/index.vue', () => {
+describe('pages/types/_slug/index.vue', () => {
   let $fetchState;
 
   beforeAll(async () => {
@@ -35,7 +35,7 @@ describe('pages/topics/_slug/index.vue', () => {
             { title: 'Two', summary: 'Two summary', lifeEvents: [] },
           ],
           criteria: [],
-          topics: {
+          types: {
             relatedKeys: ['one'],
           },
         }[contentRequest]);
diff --git a/test/pages/topics/index.spec.js b/test/pages/types/index.spec.js
similarity index 90%
rename from test/pages/topics/index.spec.js
rename to test/pages/types/index.spec.js
index 4ed49c73c4..369caa9e83 100644
--- a/test/pages/topics/index.spec.js
+++ b/test/pages/types/index.spec.js
@@ -1,8 +1,8 @@
 import { shallowMount } from '@vue/test-utils'
-import Page from '@/pages/topics/index.vue'
+import Page from '@/pages/types/index.vue'
 import beforeAllTests from '@/test/beforeAllTests';
 
-describe('pages/topics/index.vue', () => {
+describe('pages/types/index.vue', () => {
   beforeAll(async () => {
     await beforeAllTests();
   });
@@ -24,7 +24,7 @@ describe('pages/topics/index.vue', () => {
             { tags: ['one', 'two', 'three', 'four'] },
             { tags: ['one', 'two', 'three', 'four', 'five'] }
           ],
-          topics: [
+          types: [
             { slug: 'one', title: 'One title', summary: 'One summary' },
             { slug: 'three', title: 'Three title', summary: 'Three summary' },
           ],
@@ -43,14 +43,14 @@ describe('pages/topics/index.vue', () => {
   it('should merge tags with categories', () => {
     const wrapper = shallowMount(Page, {
       data: () => ({
-        topics: {
+        types: {
           one: { slug: 'one', title: 'One title', summary: 'One summary' },
           three: { slug: 'three', title: 'Three title', summary: 'Three summary' },
         }
       })
     });
     const results = wrapper.vm.mapTags(['one', 'two', 'three']);
-    expect(results[0].title).toBe('One title');
+    expect(results[0].title).toBe('One');
     expect(results[1].title).toBe('Two');
   });
 });