diff --git a/src/containers/BookingDatesForm/BookingDatesForm.test.js b/src/containers/BookingDatesForm/BookingDatesForm.test.js
index 722062da..0ff5fbf4 100644
--- a/src/containers/BookingDatesForm/BookingDatesForm.test.js
+++ b/src/containers/BookingDatesForm/BookingDatesForm.test.js
@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import Decimal from 'decimal.js';
 import { types as sdkTypes } from '../../util/sdkLoader';
 import { renderShallow, renderDeep } from '../../util/test-helpers';
-import { fakeIntl, fakeFormProps } from '../../util/test-data';
+import { fakeIntl } from '../../util/test-data';
 import { LINE_ITEM_NIGHT, TRANSITION_REQUEST } from '../../util/types';
 import { dateFromAPIToLocalNoon } from '../../util/dates';
 import { BookingBreakdown } from '../../components';
@@ -18,7 +18,6 @@ describe('BookingDatesForm', () => {
   it('matches snapshot without selected dates', () => {
     const tree = renderShallow(
       <BookingDatesFormComponent
-        {...fakeFormProps}
         unitType={LINE_ITEM_NIGHT}
         intl={fakeIntl}
         dispatch={noop}
diff --git a/src/containers/BookingDatesForm/__snapshots__/BookingDatesForm.test.js.snap b/src/containers/BookingDatesForm/__snapshots__/BookingDatesForm.test.js.snap
index 7aac3053..d874a96e 100644
--- a/src/containers/BookingDatesForm/__snapshots__/BookingDatesForm.test.js.snap
+++ b/src/containers/BookingDatesForm/__snapshots__/BookingDatesForm.test.js.snap
@@ -2,25 +2,9 @@
 
 exports[`BookingDatesForm matches snapshot without selected dates 1`] = `
 <ReactFinalForm(4.3.1)(3.1.5)
-  anyTouched={false}
-  asyncValidate={[Function]}
-  asyncValidating={false}
-  autofill={[Function]}
-  blur={[Function]}
   bookingDates={Object {}}
-  change={[Function]}
-  clearAsyncError={[Function]}
-  clearFields={[Function]}
-  clearSubmit={[Function]}
-  clearSubmitErrors={[Function]}
-  destroy={[Function]}
-  dirty={false}
   dispatch={[Function]}
   endDatePlaceholder="tomorrow"
-  form="fakeTestForm"
-  handleSubmit={[Function]}
-  initialize={[Function]}
-  initialized={true}
   intl={
     Object {
       "formatDate": [Function],
@@ -33,21 +17,11 @@ exports[`BookingDatesForm matches snapshot without selected dates 1`] = `
       "now": [Function],
     }
   }
-  invalid={false}
   isOwnListing={false}
   onSubmit={[Function]}
-  pristine={true}
-  pure={true}
   render={[Function]}
-  reset={[Function]}
-  resetSection={[Function]}
   startDatePlaceholder="today"
-  submit={[Function]}
   submitButtonWrapperClassName={null}
-  submitFailed={false}
-  submitSucceeded={false}
-  submitting={false}
-  touch={[Function]}
   unitPrice={
     Money {
       "amount": 1099,
@@ -55,7 +29,5 @@ exports[`BookingDatesForm matches snapshot without selected dates 1`] = `
     }
   }
   unitType="line-item/night"
-  untouch={[Function]}
-  valid={true}
 />
 `;
diff --git a/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.test.js b/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.test.js
index 53069a8e..30ade137 100644
--- a/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.test.js
+++ b/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderDeep } from '../../util/test-helpers';
-import { fakeIntl, fakeFormProps } from '../../util/test-data';
+import { fakeIntl } from '../../util/test-data';
 import EditListingDescriptionForm from './EditListingDescriptionForm';
 
 const noop = () => null;
@@ -9,7 +9,6 @@ describe('EditListingDescriptionForm', () => {
   it('matches snapshot', () => {
     const tree = renderDeep(
       <EditListingDescriptionForm
-        {...fakeFormProps}
         intl={fakeIntl}
         dispatch={noop}
         onSubmit={v => v}
diff --git a/src/containers/EditListingLocationForm/EditListingLocationForm.test.js b/src/containers/EditListingLocationForm/EditListingLocationForm.test.js
index 305b251d..16be521b 100644
--- a/src/containers/EditListingLocationForm/EditListingLocationForm.test.js
+++ b/src/containers/EditListingLocationForm/EditListingLocationForm.test.js
@@ -1,7 +1,7 @@
 // NOTE: renderdeep doesn't work due to Google Maps API integration
 import React from 'react';
 import { renderShallow } from '../../util/test-helpers';
-import { fakeIntl, fakeFormProps } from '../../util/test-data';
+import { fakeIntl } from '../../util/test-data';
 import { EditListingLocationFormComponent } from './EditListingLocationForm';
 
 const noop = () => null;
@@ -10,7 +10,6 @@ describe('EditListingLocationForm', () => {
   it('matches snapshot', () => {
     const tree = renderShallow(
       <EditListingLocationFormComponent
-        {...fakeFormProps}
         intl={fakeIntl}
         dispatch={noop}
         onSubmit={noop}
diff --git a/src/containers/EditListingLocationForm/__snapshots__/EditListingLocationForm.test.js.snap b/src/containers/EditListingLocationForm/__snapshots__/EditListingLocationForm.test.js.snap
index cddc1852..839c60e2 100644
--- a/src/containers/EditListingLocationForm/__snapshots__/EditListingLocationForm.test.js.snap
+++ b/src/containers/EditListingLocationForm/__snapshots__/EditListingLocationForm.test.js.snap
@@ -2,23 +2,7 @@
 
 exports[`EditListingLocationForm matches snapshot 1`] = `
 <ReactFinalForm(4.3.1)(3.1.5)
-  anyTouched={false}
-  asyncValidate={[Function]}
-  asyncValidating={false}
-  autofill={[Function]}
-  blur={[Function]}
-  change={[Function]}
-  clearAsyncError={[Function]}
-  clearFields={[Function]}
-  clearSubmit={[Function]}
-  clearSubmitErrors={[Function]}
-  destroy={[Function]}
-  dirty={false}
   dispatch={[Function]}
-  form="fakeTestForm"
-  handleSubmit={[Function]}
-  initialize={[Function]}
-  initialized={true}
   intl={
     Object {
       "formatDate": [Function],
@@ -31,24 +15,12 @@ exports[`EditListingLocationForm matches snapshot 1`] = `
       "now": [Function],
     }
   }
-  invalid={false}
   onSubmit={[Function]}
-  pristine={true}
-  pure={true}
   render={[Function]}
-  reset={[Function]}
-  resetSection={[Function]}
   saveActionMsg="Save location"
   selectedPlace={null}
-  submit={[Function]}
-  submitFailed={false}
-  submitSucceeded={false}
-  submitting={false}
-  touch={[Function]}
-  untouch={[Function]}
   updateError={null}
   updateInProgress={false}
   updated={false}
-  valid={true}
 />
 `;
diff --git a/src/containers/EditListingPhotosForm/EditListingPhotosForm.test.js b/src/containers/EditListingPhotosForm/EditListingPhotosForm.test.js
index 7d469e57..6768060a 100644
--- a/src/containers/EditListingPhotosForm/EditListingPhotosForm.test.js
+++ b/src/containers/EditListingPhotosForm/EditListingPhotosForm.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderShallow } from '../../util/test-helpers';
-import { fakeIntl, fakeFormProps } from '../../util/test-data';
+import { fakeIntl } from '../../util/test-data';
 import { EditListingPhotosFormComponent } from './EditListingPhotosForm';
 
 const noop = () => null;
@@ -9,7 +9,6 @@ describe('EditListingPhotosForm', () => {
   it('matches snapshot', () => {
     const tree = renderShallow(
       <EditListingPhotosFormComponent
-        {...fakeFormProps}
         initialValues={{ country: 'US', images: [] }}
         intl={fakeIntl}
         dispatch={noop}
diff --git a/src/containers/EditListingPhotosForm/__snapshots__/EditListingPhotosForm.test.js.snap b/src/containers/EditListingPhotosForm/__snapshots__/EditListingPhotosForm.test.js.snap
index 33a2f361..d404a32a 100644
--- a/src/containers/EditListingPhotosForm/__snapshots__/EditListingPhotosForm.test.js.snap
+++ b/src/containers/EditListingPhotosForm/__snapshots__/EditListingPhotosForm.test.js.snap
@@ -2,30 +2,14 @@
 
 exports[`EditListingPhotosForm matches snapshot 1`] = `
 <ReactFinalForm(4.3.1)(3.1.5)
-  anyTouched={false}
-  asyncValidate={[Function]}
-  asyncValidating={false}
-  autofill={[Function]}
-  blur={[Function]}
-  change={[Function]}
-  clearAsyncError={[Function]}
-  clearFields={[Function]}
-  clearSubmit={[Function]}
-  clearSubmitErrors={[Function]}
-  destroy={[Function]}
-  dirty={false}
   dispatch={[Function]}
   errors={Object {}}
-  form="fakeTestForm"
-  handleSubmit={[Function]}
   imageUploadRequested={false}
   initialValues={
     Object {
       "images": undefined,
     }
   }
-  initialize={[Function]}
-  initialized={true}
   intl={
     Object {
       "formatDate": [Function],
@@ -38,29 +22,17 @@ exports[`EditListingPhotosForm matches snapshot 1`] = `
       "now": [Function],
     }
   }
-  invalid={false}
   onImageUpload={[Function]}
   onImageUploadHandler={[Function]}
   onRemoveImage={[Function]}
   onSubmit={[Function]}
   onUpdateImageOrder={[Function]}
-  pristine={true}
-  pure={true}
   ready={false}
   render={[Function]}
-  reset={[Function]}
-  resetSection={[Function]}
   saveActionMsg="Save photos"
   stripeConnected={false}
-  submit={[Function]}
-  submitFailed={false}
-  submitSucceeded={false}
-  submitting={false}
-  touch={[Function]}
-  untouch={[Function]}
   updateError={null}
   updateInProgress={false}
   updated={false}
-  valid={true}
 />
 `;
diff --git a/src/containers/EditListingPoliciesForm/EditListingPoliciesForm.test.js b/src/containers/EditListingPoliciesForm/EditListingPoliciesForm.test.js
index a6a5bf26..5f1ea422 100644
--- a/src/containers/EditListingPoliciesForm/EditListingPoliciesForm.test.js
+++ b/src/containers/EditListingPoliciesForm/EditListingPoliciesForm.test.js
@@ -1,7 +1,7 @@
 // NOTE: renderdeep doesn't work due to Google Maps API integration
 import React from 'react';
 import { renderShallow } from '../../util/test-helpers';
-import { fakeIntl, fakeFormProps } from '../../util/test-data';
+import { fakeIntl } from '../../util/test-data';
 import { EditListingPoliciesFormComponent } from './EditListingPoliciesForm';
 
 const noop = () => null;
@@ -10,7 +10,6 @@ describe('EditListingPoliciesForm', () => {
   it('matches snapshot', () => {
     const tree = renderShallow(
       <EditListingPoliciesFormComponent
-        {...fakeFormProps}
         publicData={{}}
         intl={fakeIntl}
         dispatch={noop}
diff --git a/src/containers/EditListingPoliciesForm/__snapshots__/EditListingPoliciesForm.test.js.snap b/src/containers/EditListingPoliciesForm/__snapshots__/EditListingPoliciesForm.test.js.snap
index cc8c4902..2853466f 100644
--- a/src/containers/EditListingPoliciesForm/__snapshots__/EditListingPoliciesForm.test.js.snap
+++ b/src/containers/EditListingPoliciesForm/__snapshots__/EditListingPoliciesForm.test.js.snap
@@ -2,23 +2,7 @@
 
 exports[`EditListingPoliciesForm matches snapshot 1`] = `
 <ReactFinalForm(4.3.1)(3.1.5)
-  anyTouched={false}
-  asyncValidate={[Function]}
-  asyncValidating={false}
-  autofill={[Function]}
-  blur={[Function]}
-  change={[Function]}
-  clearAsyncError={[Function]}
-  clearFields={[Function]}
-  clearSubmit={[Function]}
-  clearSubmitErrors={[Function]}
-  destroy={[Function]}
-  dirty={false}
   dispatch={[Function]}
-  form="fakeTestForm"
-  handleSubmit={[Function]}
-  initialize={[Function]}
-  initialized={true}
   intl={
     Object {
       "formatDate": [Function],
@@ -31,25 +15,13 @@ exports[`EditListingPoliciesForm matches snapshot 1`] = `
       "now": [Function],
     }
   }
-  invalid={false}
   onSubmit={[Function]}
-  pristine={true}
   publicData={Object {}}
-  pure={true}
   render={[Function]}
-  reset={[Function]}
-  resetSection={[Function]}
   saveActionMsg="Save rules"
   selectedPlace={null}
-  submit={[Function]}
-  submitFailed={false}
-  submitSucceeded={false}
-  submitting={false}
-  touch={[Function]}
-  untouch={[Function]}
   updateError={null}
   updateInProgress={false}
   updated={false}
-  valid={true}
 />
 `;
diff --git a/src/containers/EditListingPricingForm/EditListingPricingForm.test.js b/src/containers/EditListingPricingForm/EditListingPricingForm.test.js
index 874ca1aa..d7935502 100644
--- a/src/containers/EditListingPricingForm/EditListingPricingForm.test.js
+++ b/src/containers/EditListingPricingForm/EditListingPricingForm.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderDeep } from '../../util/test-helpers';
-import { fakeIntl, fakeFormProps } from '../../util/test-data';
+import { fakeIntl } from '../../util/test-data';
 import EditListingPricingForm from './EditListingPricingForm';
 
 const noop = () => null;
@@ -9,7 +9,6 @@ describe('EditListingPricingForm', () => {
   it('matches snapshot', () => {
     const tree = renderDeep(
       <EditListingPricingForm
-        {...fakeFormProps}
         intl={fakeIntl}
         dispatch={noop}
         onSubmit={v => v}