diff --git a/src/components/ActivityFeed/__snapshots__/ActivityFeed.test.js.snap b/src/components/ActivityFeed/__snapshots__/ActivityFeed.test.js.snap
index f76c4f8d..ebb82943 100644
--- a/src/components/ActivityFeed/__snapshots__/ActivityFeed.test.js.snap
+++ b/src/components/ActivityFeed/__snapshots__/ActivityFeed.test.js.snap
@@ -5,62 +5,40 @@ exports[`ActivityFeed matches snapshot 1`] = `
   className=""
 >
   <li
-    className={undefined}
+    key="transition/request"
   >
-    <div
-      className={undefined}
-    >
-      <div
-        className={undefined}
-      >
-        <p
-          className={undefined}
-        >
+    <div>
+      <div>
+        <p>
           •
         </p>
       </div>
       <div>
-        <p
-          className={undefined}
-        />
-        <p
-          className={undefined}
-        />
+        <p />
+        <p />
       </div>
     </div>
   </li>
   <li
-    className={undefined}
+    key="transition/accept"
   >
-    <div
-      className={undefined}
-    >
-      <div
-        className={undefined}
-      >
-        <p
-          className={undefined}
-        >
+    <div>
+      <div>
+        <p>
           •
         </p>
       </div>
       <div>
-        <p
-          className={undefined}
-        />
-        <p
-          className={undefined}
-        />
+        <p />
+        <p />
       </div>
     </div>
   </li>
   <li
-    className={undefined}
     id="msg-msg1"
+    key="msg1"
   >
-    <div
-      className={undefined}
-    >
+    <div>
       <a
         className=""
         href="/u/user1"
@@ -68,49 +46,35 @@ exports[`ActivityFeed matches snapshot 1`] = `
         style={Object {}}
         title="user1 display name"
       >
-        <span
-          className={undefined}
-        >
+        <span>
           TT
         </span>
       </a>
       <div>
-        <p
-          className={undefined}
-        >
+        <p>
           Message msg1
           
           Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
         </p>
-        <p
-          className={undefined}
-        >
+        <p>
           2017-11-09, 08:12
         </p>
       </div>
     </div>
   </li>
   <li
-    className={undefined}
     id="msg-msg2"
+    key="msg2"
   >
-    <div
-      className={undefined}
-    >
-      <div
-        className={undefined}
-      >
-        <p
-          className={undefined}
-        >
+    <div>
+      <div>
+        <p>
           Message msg2
           
           Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
         </p>
       </div>
-      <p
-        className={undefined}
-      >
+      <p>
         2017-11-09, 08:12
       </p>
     </div>
diff --git a/src/components/BookingBreakdown/__snapshots__/BookingBreakdown.test.js.snap b/src/components/BookingBreakdown/__snapshots__/BookingBreakdown.test.js.snap
index 1361492b..da60e9fb 100644
--- a/src/components/BookingBreakdown/__snapshots__/BookingBreakdown.test.js.snap
+++ b/src/components/BookingBreakdown/__snapshots__/BookingBreakdown.test.js.snap
@@ -4,35 +4,23 @@ exports[`BookingBreakdown customer transaction data matches snapshot 1`] = `
 <div
   className=""
 >
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.pricePerNight
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       10
     </span>
   </div>
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.bookingPeriod
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       <span
         dangerouslySetInnerHTML={
           Object {
@@ -42,22 +30,14 @@ exports[`BookingBreakdown customer transaction data matches snapshot 1`] = `
       />
     </span>
   </div>
-  <hr
-    className={undefined}
-  />
-  <div
-    className={undefined}
-  >
-    <div
-      className={undefined}
-    >
+  <hr />
+  <div>
+    <div>
       <span>
         BookingBreakdown.total
       </span>
     </div>
-    <div
-      className={undefined}
-    >
+    <div>
       20
     </div>
   </div>
@@ -68,35 +48,23 @@ exports[`BookingBreakdown pretransaction data matches snapshot 1`] = `
 <div
   className=""
 >
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.pricePerNight
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       10
     </span>
   </div>
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.bookingPeriod
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       <span
         dangerouslySetInnerHTML={
           Object {
@@ -106,22 +74,14 @@ exports[`BookingBreakdown pretransaction data matches snapshot 1`] = `
       />
     </span>
   </div>
-  <hr
-    className={undefined}
-  />
-  <div
-    className={undefined}
-  >
-    <div
-      className={undefined}
-    >
+  <hr />
+  <div>
+    <div>
       <span>
         BookingBreakdown.total
       </span>
     </div>
-    <div
-      className={undefined}
-    >
+    <div>
       20
     </div>
   </div>
@@ -132,35 +92,23 @@ exports[`BookingBreakdown provider canceled transaction data matches snapshot 1`
 <div
   className=""
 >
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.pricePerNight
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       10
     </span>
   </div>
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.bookingPeriod
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       <span
         dangerouslySetInnerHTML={
           Object {
@@ -170,92 +118,58 @@ exports[`BookingBreakdown provider canceled transaction data matches snapshot 1`
       />
     </span>
   </div>
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.subTotal
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       20
     </span>
   </div>
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.refund
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       -20
     </span>
   </div>
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.commission
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       -2
     </span>
   </div>
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.refundProviderFee
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       2
     </span>
   </div>
-  <hr
-    className={undefined}
-  />
-  <div
-    className={undefined}
-  >
-    <div
-      className={undefined}
-    >
+  <hr />
+  <div>
+    <div>
       <span>
         BookingBreakdown.providerTotalCanceled
       </span>
     </div>
-    <div
-      className={undefined}
-    >
+    <div>
       0
     </div>
   </div>
-  <span
-    className={undefined}
-  >
+  <span>
     <span>
       BookingBreakdown.commissionFeeNote
     </span>
@@ -267,35 +181,23 @@ exports[`BookingBreakdown provider transaction data matches snapshot 1`] = `
 <div
   className=""
 >
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.pricePerNight
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       10
     </span>
   </div>
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.bookingPeriod
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       <span
         dangerouslySetInnerHTML={
           Object {
@@ -305,60 +207,38 @@ exports[`BookingBreakdown provider transaction data matches snapshot 1`] = `
       />
     </span>
   </div>
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.subTotal
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       20
     </span>
   </div>
-  <div
-    className={undefined}
-  >
-    <span
-      className={undefined}
-    >
+  <div>
+    <span>
       <span>
         BookingBreakdown.commission
       </span>
     </span>
-    <span
-      className={undefined}
-    >
+    <span>
       -2
     </span>
   </div>
-  <hr
-    className={undefined}
-  />
-  <div
-    className={undefined}
-  >
-    <div
-      className={undefined}
-    >
+  <hr />
+  <div>
+    <div>
       <span>
         BookingBreakdown.providerTotalDefault
       </span>
     </div>
-    <div
-      className={undefined}
-    >
+    <div>
       18
     </div>
   </div>
-  <span
-    className={undefined}
-  >
+  <span>
     <span>
       BookingBreakdown.commissionFeeNote
     </span>
diff --git a/src/components/Modal/__snapshots__/Modal.test.js.snap b/src/components/Modal/__snapshots__/Modal.test.js.snap
index 79243838..f58032d0 100644
--- a/src/components/Modal/__snapshots__/Modal.test.js.snap
+++ b/src/components/Modal/__snapshots__/Modal.test.js.snap
@@ -4,12 +4,8 @@ exports[`Modal no extra classes when window is missing 1`] = `
 <div
   className="test-class-from-props"
 >
-  <div
-    className={undefined}
-  >
-    <div
-      className={undefined}
-    >
+  <div>
+    <div>
       <div
         className=""
       >
diff --git a/src/components/ModalInMobile/__snapshots__/ModalInMobile.test.js.snap b/src/components/ModalInMobile/__snapshots__/ModalInMobile.test.js.snap
index eb874b07..15c81dfe 100644
--- a/src/components/ModalInMobile/__snapshots__/ModalInMobile.test.js.snap
+++ b/src/components/ModalInMobile/__snapshots__/ModalInMobile.test.js.snap
@@ -4,12 +4,8 @@ exports[`ModalInMobile no extra classes when window is missing 1`] = `
 <div
   className="test-class-from-props"
 >
-  <div
-    className={undefined}
-  >
-    <div
-      className={undefined}
-    >
+  <div>
+    <div>
       <div
         className=""
       >
diff --git a/src/components/OrderDiscussionPanel/__snapshots__/OrderDiscussionPanel.test.js.snap b/src/components/OrderDiscussionPanel/__snapshots__/OrderDiscussionPanel.test.js.snap
index bba4cb4f..93a70382 100644
--- a/src/components/OrderDiscussionPanel/__snapshots__/OrderDiscussionPanel.test.js.snap
+++ b/src/components/OrderDiscussionPanel/__snapshots__/OrderDiscussionPanel.test.js.snap
@@ -6,30 +6,22 @@ exports[`OrderDiscussionPanel matches snapshot 1`] = `
 >
   <ul>
     <li>
-      <span
-        className={undefined}
-      >
+      <span>
         2017-02-26T00:00:00.000Z
       </span>
-      <div
-        className={undefined}
-      >
+      <div>
         Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ac tellus ornare, tempor lacus quis, imperdiet lectus. Morbi suscipit semper nisl at lacinia. Vestibulum malesuada mattis nisl, et venenatis enim volutpat sit amet. Nulla laoreet feugiat gravida. Fusce ultricies nisl quis aliquet ullamcorper. Nulla congue risus metus.
       </div>
-      <span
-        className={undefined}
-      >
+      <span>
         John
       </span>
     </li>
   </ul>
   <form
-    className={undefined}
     onSubmit={[Function]}
   >
     <input
       autoFocus={true}
-      className={undefined}
       onChange={[Function]}
       type="text"
       value=""
diff --git a/src/components/SectionHero/__snapshots__/SectionHero.test.js.snap b/src/components/SectionHero/__snapshots__/SectionHero.test.js.snap
index 6fe64f82..3e408391 100644
--- a/src/components/SectionHero/__snapshots__/SectionHero.test.js.snap
+++ b/src/components/SectionHero/__snapshots__/SectionHero.test.js.snap
@@ -4,16 +4,12 @@ exports[`SectionHero matches snapshot 1`] = `
 <div
   className=""
 >
-  <h1
-    className={undefined}
-  >
+  <h1>
     <span>
       SectionHero.title
     </span>
   </h1>
-  <h2
-    className={undefined}
-  >
+  <h2>
     <span>
       SectionHero.subTitle
     </span>
@@ -65,14 +61,12 @@ exports[`SectionHero matches snapshot 1`] = `
         className=""
       >
         <svg
-          className={undefined}
           height="22"
           viewBox="0 0 21 22"
           width="21"
           xmlns="http://www.w3.org/2000/svg"
         >
           <g
-            className={undefined}
             fill="none"
             fillRule="evenodd"
             strokeLinecap="round"
diff --git a/src/components/TopbarDesktop/__snapshots__/TopbarDesktop.test.js.snap b/src/components/TopbarDesktop/__snapshots__/TopbarDesktop.test.js.snap
index 3bead1fd..f0a18c92 100644
--- a/src/components/TopbarDesktop/__snapshots__/TopbarDesktop.test.js.snap
+++ b/src/components/TopbarDesktop/__snapshots__/TopbarDesktop.test.js.snap
@@ -30,14 +30,12 @@ exports[`TopbarDesktop data matches snapshot 1`] = `
         className=""
       >
         <svg
-          className={undefined}
           height="22"
           viewBox="0 0 21 22"
           width="21"
           xmlns="http://www.w3.org/2000/svg"
         >
           <g
-            className={undefined}
             fill="none"
             fillRule="evenodd"
             strokeLinecap="round"
@@ -78,9 +76,7 @@ exports[`TopbarDesktop data matches snapshot 1`] = `
     style={Object {}}
     title={null}
   >
-    <span
-      className={undefined}
-    >
+    <span>
       <span>
         TopbarDesktop.createListing
       </span>
@@ -93,9 +89,7 @@ exports[`TopbarDesktop data matches snapshot 1`] = `
     style={Object {}}
     title={null}
   >
-    <span
-      className={undefined}
-    >
+    <span>
       <span>
         TopbarDesktop.inbox
       </span>
@@ -114,11 +108,8 @@ exports[`TopbarDesktop data matches snapshot 1`] = `
     >
       <div
         className=""
-        title={undefined}
       >
-        <span
-          className={undefined}
-        />
+        <span />
       </div>
     </button>
     <div
@@ -139,9 +130,7 @@ exports[`TopbarDesktop data matches snapshot 1`] = `
             style={Object {}}
             title={null}
           >
-            <span
-              className={undefined}
-            />
+            <span />
             <span>
               TopbarDesktop.yourListingsLink
             </span>
@@ -158,9 +147,7 @@ exports[`TopbarDesktop data matches snapshot 1`] = `
             style={Object {}}
             title={null}
           >
-            <span
-              className={undefined}
-            />
+            <span />
             <span>
               TopbarDesktop.profileSettingsLink
             </span>
@@ -177,9 +164,7 @@ exports[`TopbarDesktop data matches snapshot 1`] = `
             style={Object {}}
             title={null}
           >
-            <span
-              className={undefined}
-            />
+            <span />
             <span>
               TopbarDesktop.accountSettingsLink
             </span>
@@ -194,9 +179,7 @@ exports[`TopbarDesktop data matches snapshot 1`] = `
             disabled={false}
             onClick={[Function]}
           >
-            <span
-              className={undefined}
-            />
+            <span />
             <span>
               TopbarDesktop.logout
             </span>
diff --git a/src/containers/EditListingDescriptionForm/__snapshots__/EditListingDescriptionForm.test.js.snap b/src/containers/EditListingDescriptionForm/__snapshots__/EditListingDescriptionForm.test.js.snap
index 996e472f..dd97d5b0 100644
--- a/src/containers/EditListingDescriptionForm/__snapshots__/EditListingDescriptionForm.test.js.snap
+++ b/src/containers/EditListingDescriptionForm/__snapshots__/EditListingDescriptionForm.test.js.snap
@@ -79,11 +79,13 @@ exports[`EditListingDescriptionForm matches snapshot 1`] = `
         EditListingDescriptionForm.categoryPlaceholder
       </option>
       <option
+        key="cat1"
         value="cat1"
       >
         Cat 1
       </option>
       <option
+        key="cat2"
         value="cat2"
       >
         Cat 2
diff --git a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
index 98d8959d..cebd38c5 100644
--- a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
+++ b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
@@ -338,12 +338,8 @@ exports[`InboxPage matches snapshot 1`] = `
 `;
 
 exports[`InboxPage matches snapshot 2`] = `
-<div
-  className={undefined}
->
-  <div
-    className={undefined}
-  >
+<div>
+  <div>
     <a
       className=""
       href="/u/provider-user-id"
@@ -351,9 +347,7 @@ exports[`InboxPage matches snapshot 2`] = `
       style={Object {}}
       title="provider-user-id display name"
     >
-      <span
-        className={undefined}
-      >
+      <span>
         TT
       </span>
     </a>
@@ -365,12 +359,8 @@ exports[`InboxPage matches snapshot 2`] = `
     style={Object {}}
     title={null}
   >
-    <div
-      className={undefined}
-    />
-    <div
-      className={undefined}
-    >
+    <div />
+    <div>
       <div
         className=""
       >
@@ -380,16 +370,12 @@ exports[`InboxPage matches snapshot 2`] = `
         className=""
       >
         2017-02-15 - 2017-02-16
-        <span
-          className={undefined}
-        >
+        <span>
           10
         </span>
       </div>
     </div>
-    <div
-      className={undefined}
-    >
+    <div>
       <div
         className=""
       >
@@ -744,12 +730,8 @@ exports[`InboxPage matches snapshot 3`] = `
 `;
 
 exports[`InboxPage matches snapshot 4`] = `
-<div
-  className={undefined}
->
-  <div
-    className={undefined}
-  >
+<div>
+  <div>
     <a
       className=""
       href="/u/customer-user-id"
@@ -757,9 +739,7 @@ exports[`InboxPage matches snapshot 4`] = `
       style={Object {}}
       title="customer-user-id display name"
     >
-      <span
-        className={undefined}
-      >
+      <span>
         TT
       </span>
     </a>
@@ -771,16 +751,10 @@ exports[`InboxPage matches snapshot 4`] = `
     style={Object {}}
     title={null}
   >
-    <div
-      className={undefined}
-    >
-      <div
-        className={undefined}
-      />
+    <div>
+      <div />
     </div>
-    <div
-      className={undefined}
-    >
+    <div>
       <div
         className=""
       >
@@ -790,16 +764,12 @@ exports[`InboxPage matches snapshot 4`] = `
         className=""
       >
         2017-02-15 - 2017-02-16
-        <span
-          className={undefined}
-        >
+        <span>
           9
         </span>
       </div>
     </div>
-    <div
-      className={undefined}
-    >
+    <div>
       <div
         className=""
       >
diff --git a/src/containers/LoginForm/__snapshots__/LoginForm.test.js.snap b/src/containers/LoginForm/__snapshots__/LoginForm.test.js.snap
index f26bc09e..1b8bc420 100644
--- a/src/containers/LoginForm/__snapshots__/LoginForm.test.js.snap
+++ b/src/containers/LoginForm/__snapshots__/LoginForm.test.js.snap
@@ -55,15 +55,9 @@ exports[`LoginForm matches snapshot 1`] = `
       />
     </div>
   </div>
-  <div
-    className={undefined}
-  >
-    <p
-      className={undefined}
-    >
-      <span
-        className={undefined}
-      >
+  <div>
+    <p>
+      <span>
         <span>
           LoginForm.forgotPasswordInfo
         </span>
diff --git a/src/containers/SignupForm/__snapshots__/SignupForm.test.js.snap b/src/containers/SignupForm/__snapshots__/SignupForm.test.js.snap
index 5cdf7eb3..127b84e2 100644
--- a/src/containers/SignupForm/__snapshots__/SignupForm.test.js.snap
+++ b/src/containers/SignupForm/__snapshots__/SignupForm.test.js.snap
@@ -31,9 +31,7 @@ exports[`SignupForm matches snapshot 1`] = `
         value=""
       />
     </div>
-    <div
-      className={undefined}
-    >
+    <div>
       <div
         className=""
       >
@@ -105,15 +103,9 @@ exports[`SignupForm matches snapshot 1`] = `
       />
     </div>
   </div>
-  <div
-    className={undefined}
-  >
-    <p
-      className={undefined}
-    >
-      <span
-        className={undefined}
-      >
+  <div>
+    <p>
+      <span>
         <span>
           SignupForm.termsAndConditionsAcceptText
         </span>