diff --git a/__tests__/views/__snapshots__/Home.test.js.snap b/__tests__/views/__snapshots__/Home.test.js.snap
index 172dd3b19..a328b9075 100644
--- a/__tests__/views/__snapshots__/Home.test.js.snap
+++ b/__tests__/views/__snapshots__/Home.test.js.snap
@@ -1,46 +1,36 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders without crashing 1`] = `
-<MenuProvider
-  backHandler={false}
-  customStyles={Object {}}
+<View
   style={
     Object {
-      "flex": 1,
+      "backgroundColor": "#EAEAEA",
+      "flexGrow": 1,
     }
   }
 >
-  <View
-    style={
-      Object {
-        "backgroundColor": "#EAEAEA",
-        "flexGrow": 1,
-      }
-    }
+  <ScrollView
+    onScroll={[Function]}
+    scrollEventThrottle={69}
   >
-    <ScrollView
-      onScroll={[Function]}
-      scrollEventThrottle={69}
-    >
-      <Connect(WeatherCardContainer)
-        key="weather"
-      />
-      <Connect(ShuttleCardContainer)
-        key="shuttle"
-      />
-      <Connect(DiningCardContainer)
-        key="dining"
-      />
-      <Connect(EventCardContainer)
-        key="events"
-      />
-      <Connect(QuicklinksCardContainer)
-        key="quicklinks"
-      />
-      <Connect(NewsCardContainer)
-        key="news"
-      />
-    </ScrollView>
-  </View>
-</MenuProvider>
+    <Connect(WeatherCardContainer)
+      key="weather"
+    />
+    <Connect(withNavigation(ShuttleCardContainer))
+      key="shuttle"
+    />
+    <Connect(DiningCardContainer)
+      key="dining"
+    />
+    <Connect(EventCardContainer)
+      key="events"
+    />
+    <Connect(QuicklinksCardContainer)
+      key="quicklinks"
+    />
+    <Connect(NewsCardContainer)
+      key="news"
+    />
+  </ScrollView>
+</View>
 `;
diff --git a/__tests__/views/dining/DiningCard.test.js b/__tests__/views/dining/DiningCard.test.js
index b34fe7fb8..7eed252b3 100644
--- a/__tests__/views/dining/DiningCard.test.js
+++ b/__tests__/views/dining/DiningCard.test.js
@@ -5,8 +5,8 @@ import Adapter from 'enzyme-adapter-react-16';
 
 // Component to be tested
 import { DiningCardContainer } from '../../../app/views/dining/DiningCardContainer';
-import DataListCard from '../../../app/views/common/DataListCard';
-import { DINING_RESPONSE } from '../../../mockApis/diningAPI';
+import { DataListCard } from '../../../app/views/common/DataListCard';
+import { DINING_RESPONSE } from '../../../mockApis/diningApi';
 
 Enzyme.configure({ adapter: new Adapter() });
 
diff --git a/__tests__/views/dining/__snapshots__/DiningCard.test.js.snap b/__tests__/views/dining/__snapshots__/DiningCard.test.js.snap
index 07c795c10..9445bd32a 100644
--- a/__tests__/views/dining/__snapshots__/DiningCard.test.js.snap
+++ b/__tests__/views/dining/__snapshots__/DiningCard.test.js.snap
@@ -116,7 +116,7 @@ Sat & Sun: 10 am - 8 pm",
 `;
 
 exports[`container renders without crashing 1`] = `
-<DataListCard
+<withNavigation(DataListCard)
   data={
     Array [
       Object {
@@ -179,7 +179,6 @@ Sat & Sun: 10 am - 8 pm",
   }
   id="dining"
   item="DiningItem"
-  rows={3}
   title="Dining"
 />
 `;
diff --git a/__tests__/views/events/EventCard.test.js b/__tests__/views/events/EventCard.test.js
index 55b7acc7e..a856f59fe 100644
--- a/__tests__/views/events/EventCard.test.js
+++ b/__tests__/views/events/EventCard.test.js
@@ -5,7 +5,7 @@ import Adapter from 'enzyme-adapter-react-16';
 
 // Component to be tested
 import { EventCardContainer } from '../../../app/views/events/EventCardContainer';
-import DataListCard from '../../../app/views/common/DataListCard';
+import { DataListCard } from '../../../app/views/common/DataListCard';
 import { EVENTS_RESPONSE } from '../../../mockApis/eventsApi';
 
 Enzyme.configure({ adapter: new Adapter() });
diff --git a/__tests__/views/events/__snapshots__/EventCard.test.js.snap b/__tests__/views/events/__snapshots__/EventCard.test.js.snap
index 54a0e62dc..f8122ed80 100644
--- a/__tests__/views/events/__snapshots__/EventCard.test.js.snap
+++ b/__tests__/views/events/__snapshots__/EventCard.test.js.snap
@@ -82,7 +82,7 @@ exports[`card renders without crashing 1`] = `
 `;
 
 exports[`container renders without crashing 1`] = `
-<DataListCard
+<withNavigation(DataListCard)
   data={
     Array [
       Object {
@@ -111,7 +111,6 @@ exports[`container renders without crashing 1`] = `
   }
   id="events"
   item="EventItem"
-  rows={3}
   title="Events"
 />
 `;
diff --git a/__tests__/views/news/NewsCard.test.js b/__tests__/views/news/NewsCard.test.js
index 792ca1869..a27df1b76 100644
--- a/__tests__/views/news/NewsCard.test.js
+++ b/__tests__/views/news/NewsCard.test.js
@@ -5,7 +5,7 @@ import Adapter from 'enzyme-adapter-react-16';
 
 // Component to be tested
 import { NewsCardContainer } from '../../../app/views/news/NewsCardContainer';
-import DataListCard from '../../../app/views/common/DataListCard';
+import { DataListCard } from '../../../app/views/common/DataListCard';
 import { NEWS_RESPONSE } from '../../../mockApis/newsApi';
 
 Enzyme.configure({ adapter: new Adapter() });
diff --git a/__tests__/views/news/__snapshots__/NewsCard.test.js.snap b/__tests__/views/news/__snapshots__/NewsCard.test.js.snap
index 6fa275062..c3019efde 100644
--- a/__tests__/views/news/__snapshots__/NewsCard.test.js.snap
+++ b/__tests__/views/news/__snapshots__/NewsCard.test.js.snap
@@ -69,7 +69,7 @@ exports[`card renders without crashing 1`] = `
 `;
 
 exports[`container renders without crashing 1`] = `
-<DataListCard
+<withNavigation(DataListCard)
   data={
     Array [
       Object {
@@ -85,7 +85,6 @@ exports[`container renders without crashing 1`] = `
   }
   id="news"
   item="NewsItem"
-  rows={3}
   title="News"
 />
 `;
diff --git a/__tests__/views/quicklinks/QuicklinksCard.test.js b/__tests__/views/quicklinks/QuicklinksCard.test.js
index e7ac536a0..9c2efa833 100644
--- a/__tests__/views/quicklinks/QuicklinksCard.test.js
+++ b/__tests__/views/quicklinks/QuicklinksCard.test.js
@@ -5,7 +5,7 @@ import Adapter from 'enzyme-adapter-react-16';
 
 // Component to be tested
 import { QuicklinksCardContainer } from '../../../app/views/quicklinks/QuicklinksCardContainer';
-import DataListCard from '../../../app/views/common/DataListCard';
+import { DataListCard } from '../../../app/views/common/DataListCard';
 import general from '../../../app/util/general';
 import { QUICKLINKS_RESPONSE } from '../../../mockApis/quicklinksApi';
 
diff --git a/__tests__/views/quicklinks/__snapshots__/QuicklinksCard.test.js.snap b/__tests__/views/quicklinks/__snapshots__/QuicklinksCard.test.js.snap
index 6f04d7aea..d7c24edba 100644
--- a/__tests__/views/quicklinks/__snapshots__/QuicklinksCard.test.js.snap
+++ b/__tests__/views/quicklinks/__snapshots__/QuicklinksCard.test.js.snap
@@ -84,7 +84,7 @@ exports[`card renders without crashing 1`] = `
 `;
 
 exports[`container renders without crashing 1`] = `
-<DataListCard
+<withNavigation(DataListCard)
   cardSort={[Function]}
   data={
     Array [
diff --git a/__tests__/views/shuttle/ShuttleCard.test.js b/__tests__/views/shuttle/ShuttleCard.test.js
index ab87274de..c255b0205 100644
--- a/__tests__/views/shuttle/ShuttleCard.test.js
+++ b/__tests__/views/shuttle/ShuttleCard.test.js
@@ -5,7 +5,7 @@ import Adapter from 'enzyme-adapter-react-16';
 
 // Component to be tested
 import { ShuttleCardContainer } from '../../../app/views/shuttle/ShuttleCardContainer';
-import ShuttleCard from '../../../app/views/shuttle/ShuttleCard';
+import { ShuttleCard } from '../../../app/views/shuttle/ShuttleCard';
 import {
 	CLOSEST_STOP,
 	SHUTTLE_STOPS_DATA,
@@ -32,7 +32,10 @@ const initialCardState = {
 	gotoRoutesList: jest.fn(),
 	removeStop: jest.fn(),
 	updateScroll: jest.fn(),
-	lastScroll: 0
+	lastScroll: 0,
+	navigation: {
+		navigate: jest.fn()
+	}
 };
 
 // Set up container to be rendered
diff --git a/__tests__/views/shuttle/__snapshots__/ShuttleCard.test.js.snap b/__tests__/views/shuttle/__snapshots__/ShuttleCard.test.js.snap
index 46b8de55f..fd95a6841 100644
--- a/__tests__/views/shuttle/__snapshots__/ShuttleCard.test.js.snap
+++ b/__tests__/views/shuttle/__snapshots__/ShuttleCard.test.js.snap
@@ -53,7 +53,7 @@ exports[`card renders without crashing 1`] = `
 `;
 
 exports[`container renders without crashing 1`] = `
-<ShuttleCard
+<withNavigation(ShuttleCard)
   gotoRoutesList={[Function]}
   gotoSavedList={[Function]}
   lastScroll={0}
diff --git a/__tests__/views/specialEvents/__snapshots__/SpecialEventsCard.test.js.snap b/__tests__/views/specialEvents/__snapshots__/SpecialEventsCard.test.js.snap
index ed1cdaaf9..226c2b9ca 100644
--- a/__tests__/views/specialEvents/__snapshots__/SpecialEventsCard.test.js.snap
+++ b/__tests__/views/specialEvents/__snapshots__/SpecialEventsCard.test.js.snap
@@ -12,7 +12,7 @@ exports[`card renders without crashing 1`] = `
 `;
 
 exports[`container renders without crashing 1`] = `
-<SpecialEventsCard
+<withNavigation(SpecialEventsCard)
   hideCard={[MockFunction]}
   saved={Array []}
   specialEvents={
diff --git a/__tests__/views/weather/__snapshots__/WeatherCard.test.js.snap b/__tests__/views/weather/__snapshots__/WeatherCard.test.js.snap
index 0f5d1db9c..56dea1265 100644
--- a/__tests__/views/weather/__snapshots__/WeatherCard.test.js.snap
+++ b/__tests__/views/weather/__snapshots__/WeatherCard.test.js.snap
@@ -411,14 +411,14 @@ exports[`card renders without crashing 1`] = `
         }
       }
     />
-    <SurfButton />
+    <withNavigation(SurfButton) />
   </View>
 </Connect(Card)>
 `;
 
 exports[`container renders without crashing 1`] = `
 <WeatherCard
-  actionButton={<SurfButton />}
+  actionButton={<withNavigation(SurfButton) />}
   weatherData={
     Object {
       "currently": Object {
diff --git a/app/views/common/DataListCard.js b/app/views/common/DataListCard.js
index 3a03fecac..1e65acc2e 100644
--- a/app/views/common/DataListCard.js
+++ b/app/views/common/DataListCard.js
@@ -27,7 +27,7 @@ import {
  * @param {Function} cardSort array sorting function
  * @return {JSX} Generic component for list type cards
  */
-const DataListCard = ({ navigation, id, title, data, item, rows, cardSort }) => {
+export const DataListCard = ({ navigation, id, title, data, item, rows, cardSort }) => {
 	let sortedData = data;
 	if (cardSort && sortedData) {
 		sortedData = sortedData.slice().sort(cardSort);
diff --git a/app/views/shuttle/ShuttleCard.js b/app/views/shuttle/ShuttleCard.js
index 118ac845a..6622324a3 100644
--- a/app/views/shuttle/ShuttleCard.js
+++ b/app/views/shuttle/ShuttleCard.js
@@ -18,7 +18,7 @@ import {
 	MAX_CARD_WIDTH
 } from '../../styles/LayoutConstants';
 
-const ShuttleCard = ({ navigation, stopsData, savedStops, gotoRoutesList, gotoSavedList, updateScroll, lastScroll }) => {
+export const ShuttleCard = ({ navigation, stopsData, savedStops, gotoRoutesList, gotoSavedList, updateScroll, lastScroll }) => {
 	const extraActions = [
 		{
 			name: 'Manage Stops',