diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CameraActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CameraActivityTest.java
new file mode 100644
index 000000000..1f176af87
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CameraActivityTest.java
@@ -0,0 +1,35 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on CameraActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class CameraActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<CameraActivity> mActivityRule = new ActivityTestRule<>(CameraActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.cameraMapView);
+    }
+}
+
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivityTest.java
new file mode 100644
index 000000000..68633547e
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivityTest.java
@@ -0,0 +1,34 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on CameraActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class CoordinateChangeActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<CoordinateChangeActivity> mActivityRule = new ActivityTestRule<>(CoordinateChangeActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.mapView);
+    }
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DirectionsActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DirectionsActivityTest.java
new file mode 100644
index 000000000..3ce8d00aa
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DirectionsActivityTest.java
@@ -0,0 +1,34 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on DirectionsActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class DirectionsActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<DirectionsActivity> mActivityRule = new ActivityTestRule<>(DirectionsActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.mapView);
+    }
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivityTest.java
new file mode 100644
index 000000000..db014b69a
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivityTest.java
@@ -0,0 +1,35 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on DoubleMapActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class DoubleMapActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<DoubleMapActivity> mActivityRule = new ActivityTestRule<>(DoubleMapActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.mapView);
+        checkViewIsDisplayed(R.id.mini_map);
+    }
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/GeocoderActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/GeocoderActivityTest.java
new file mode 100644
index 000000000..c1ca7413c
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/GeocoderActivityTest.java
@@ -0,0 +1,34 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on GeocoderActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class GeocoderActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<GeocoderActivity> mActivityRule = new ActivityTestRule<>(GeocoderActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.mapView);
+    }
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivityTest.java
new file mode 100644
index 000000000..e507c6cd6
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivityTest.java
@@ -0,0 +1,34 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on InfoWindowConcurrentActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class InfoWindowConcurrentActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<InfoWindowConcurrentActivity> mActivityRule = new ActivityTestRule<>(InfoWindowConcurrentActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.infoWindowConcurrentMapView);
+    }
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/LatLngBoundsActivityTest.java
similarity index 91%
rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java
rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/LatLngBoundsActivityTest.java
index ad74ea21c..057979aeb 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/LatLngBoundsActivityTest.java
@@ -14,7 +14,7 @@ import org.junit.runner.RunWith;
  */
 @RunWith(AndroidJUnit4.class)
 @LargeTest
-public class VisibleCoordinateBoundsActivityTest extends BaseTest {
+public class LatLngBoundsActivityTest extends BaseTest {
 
     @Rule
     public ActivityTestRule<LatLngBoundsActivity> mActivityRule = new ActivityTestRule<>(
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java
index 8c6e9c50b..7c56f4c87 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java
@@ -40,11 +40,8 @@ public class MainActivityScreenTest extends BaseTest {
         checkViewIsDisplayed(R.id.mainMapView);
     }
 
-    /*
-     * Take a screenshot of Mapbox Streets to monitor #1649
-     */
     @Test
-    public void testMapboxStreetsBlackAndWhite() {
+    public void testStyleEmerald() {
         DrawerUtils.openDrawer();
         DrawerUtils.clickItem(R.string.styleEmerald);
         GestureUtils.doubleClickGesture(R.id.mainMapView);
@@ -52,4 +49,40 @@ public class MainActivityScreenTest extends BaseTest {
         takeNamedScreenshot(mActivity, "testEmeraldStyle");
     }
 
+    @Test
+    public void testStyleStreets() {
+        DrawerUtils.openDrawer();
+        DrawerUtils.clickItem(R.string.styleMapboxStreets);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        takeNamedScreenshot(mActivity, "testStreetsStyle");
+    }
+
+    @Test
+    public void testStyleDark() {
+        DrawerUtils.openDrawer();
+        DrawerUtils.clickItem(R.string.styleDark);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        takeNamedScreenshot(mActivity, "testDarkStyle");
+    }
+
+    @Test
+    public void testStyleLight() {
+        DrawerUtils.openDrawer();
+        DrawerUtils.clickItem(R.string.styleLight);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        takeNamedScreenshot(mActivity, "testLightStyle");
+    }
+
+    @Test
+    public void testStyleSatellite() {
+        DrawerUtils.openDrawer();
+        DrawerUtils.clickItem(R.string.styleSatellite);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        GestureUtils.doubleClickGesture(R.id.mainMapView);
+        takeNamedScreenshot(mActivity, "testSatelliteStyle");
+    }
+
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java
index c545bc118..a5f3a2e79 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java
@@ -129,34 +129,6 @@ public class MainActivityTest extends BaseTest {
                 .check(matches(isDisplayed()));
     }
 
-    @Test
-    public void testSwipeLeftMap() {
-        onView(withId(R.id.mainMapView))
-                .perform(swipeLeft())
-                .check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void testSwipeRightMap() {
-        onView(withId(R.id.mainMapView))
-                .perform(swipeRight())
-                .check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void testSwipeDownMap() {
-        onView(withId(R.id.mainMapView))
-                .perform(swipeDown())
-                .check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void testSwipeUpMap() {
-        onView(withId(R.id.mainMapView))
-                .perform(swipeUp())
-                .check(matches(isDisplayed()));
-    }
-
     /*
      * Test the main drawer options
      */
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivityTest.java
new file mode 100644
index 000000000..8ce8498d6
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivityTest.java
@@ -0,0 +1,34 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on ManualZoomActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class ManualZoomActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<ManualZoomActivity> mActivityRule = new ActivityTestRule<>(ManualZoomActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.manualZoomMapView);
+    }
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapPaddingActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapPaddingActivityTest.java
new file mode 100644
index 000000000..c25207785
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapPaddingActivityTest.java
@@ -0,0 +1,34 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on MapPaddingActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class MapPaddingActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<MapPaddingActivity> mActivityRule = new ActivityTestRule<>(MapPaddingActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.mapView);
+    }
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapboxMapActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapboxMapActivityTest.java
new file mode 100644
index 000000000..eaa1584a3
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapboxMapActivityTest.java
@@ -0,0 +1,34 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on MapboxMapActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class MapboxMapActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<MapboxMapActivity> mActivityRule = new ActivityTestRule<>(MapboxMapActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.mapView);
+    }
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MaxMinZoomActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MaxMinZoomActivityTest.java
new file mode 100644
index 000000000..e93a7675f
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MaxMinZoomActivityTest.java
@@ -0,0 +1,34 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on MaxMinZoomActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class MaxMinZoomActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<MaxMinZoomActivity> mActivityRule = new ActivityTestRule<>(MaxMinZoomActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.manualZoomMapView);
+    }
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ScrollByActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ScrollByActivityTest.java
new file mode 100644
index 000000000..05386b089
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/ScrollByActivityTest.java
@@ -0,0 +1,26 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on ScrollByActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class ScrollByActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<ScrollByActivity> mActivityRule = new ActivityTestRule<>(ScrollByActivity.class);
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.mapView);
+    }
+}
+
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SupportMapFragmentActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SupportMapFragmentActivityTest.java
new file mode 100644
index 000000000..7ae03e0d0
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SupportMapFragmentActivityTest.java
@@ -0,0 +1,35 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.app.Activity;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests on SupportMapFragmentActivity
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class SupportMapFragmentActivityTest extends BaseTest {
+
+    @Rule
+    public ActivityTestRule<SupportMapFragmentActivity> mActivityRule = new ActivityTestRule<>(SupportMapFragmentActivity.class);
+
+    private Activity mActivity = null;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanity() {
+        checkViewIsDisplayed(R.id.fragment_container);
+    }
+}
+
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivity.java
index 168979a9f..ae2656ca6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivity.java
@@ -64,7 +64,7 @@ public class DoubleMapActivity extends AppCompatActivity {
             super.onViewCreated(view, savedInstanceState);
 
             // MapView large
-            mMapView = (MapView) view.findViewById(R.id.mapview);
+            mMapView = (MapView) view.findViewById(R.id.mapView);
             mMapView.onCreate(savedInstanceState);
             mMapView.getMapAsync(new OnMapReadyCallback() {
                 @Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
index 230a0a308..b50dcf228 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
@@ -5,7 +5,7 @@
     android:layout_height="fill_parent">
 
     <com.mapbox.mapboxsdk.maps.MapView
-        android:id="@+id/mapview"
+        android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         mapbox:access_token="@string/access_token" />