[android] - run MapboxMap invocations to ui thread for instrumentation tests (#9198)

24 files changed, 8298 insertions, 6391 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/gradle-checkstyle.gradle b/platform/android/MapboxGLAndroidSDKTestApp/gradle-checkstyle.gradle
index fdc4399f16..e4e1ba0453 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/gradle-checkstyle.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/gradle-checkstyle.gradle
@@ -13,6 +13,7 @@ task checkstyle(type: Checkstyle) {
     include '**/*.java'
     exclude '**/gen/**'
     exclude '**/style/*LayerTest.java'
+    exclude '**/style/LightTest.java'
     classpath = files()
     ignoreFailures = false
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java
new file mode 100644
index 0000000000..47af80cab9
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/MapboxMapAction.java
@@ -0,0 +1,49 @@
+package com.mapbox.mapboxsdk.testapp.action;
+
+import android.support.test.espresso.UiController;
+import android.support.test.espresso.ViewAction;
+import android.view.View;
+
+import com.mapbox.mapboxsdk.maps.MapboxMap;
+
+import org.hamcrest.Matcher;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+
+public class MapboxMapAction implements ViewAction {
+
+  private OnInvokeActionListener invokeViewAction;
+  private MapboxMap mapboxMap;
+
+  private MapboxMapAction(OnInvokeActionListener invokeViewAction, MapboxMap mapboxMap) {
+    this.invokeViewAction = invokeViewAction;
+    this.mapboxMap = mapboxMap;
+  }
+
+  @Override
+  public Matcher<View> getConstraints() {
+    return isDisplayed();
+  }
+
+  @Override
+  public String getDescription() {
+    return getClass().getSimpleName();
+  }
+
+  @Override
+  public void perform(UiController uiController, View view) {
+    invokeViewAction.onInvokeAction(uiController, mapboxMap);
+  }
+
+  public static void invoke(MapboxMap mapboxMap, OnInvokeActionListener invokeViewAction) {
+    onView(withId(android.R.id.content)).perform(new MapboxMapAction(invokeViewAction, mapboxMap));
+  }
+
+  public interface OnInvokeActionListener {
+    void onInvokeAction(UiController uiController, MapboxMap mapboxMap);
+  }
+}
+
+
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java
index 2f638ff651..e511135b99 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java
@@ -1,27 +1,24 @@
 package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
 
-import org.hamcrest.Matcher;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.assertEquals;
 
 public class MarkerTest extends BaseActivityTest {
@@ -37,87 +34,45 @@ public class MarkerTest extends BaseActivityTest {
   @Ignore
   public void addMarkerTest() {
     validateTestSetup();
-    assertEquals("Markers should be empty", 0, mapboxMap.getMarkers().size());
-
-    MarkerOptions options = new MarkerOptions();
-    options.setPosition(new LatLng());
-    options.setSnippet(TestConstants.TEXT_MARKER_SNIPPET);
-    options.setTitle(TestConstants.TEXT_MARKER_TITLE);
-
-    onView(withId(R.id.mapView)).perform(new AddMarkerAction(mapboxMap, options));
-    assertEquals("Markers sze should be 1, ", 1, mapboxMap.getMarkers().size());
-    assertEquals("Marker id should be 0", 0, marker.getId());
-    assertEquals("Marker target should match", new LatLng(), marker.getPosition());
-    assertEquals("Marker snippet should match", TestConstants.TEXT_MARKER_SNIPPET, marker.getSnippet());
-    assertEquals("Marker target should match", TestConstants.TEXT_MARKER_TITLE, marker.getTitle());
-    mapboxMap.clear();
-    assertEquals("Markers should be empty", 0, mapboxMap.getMarkers().size());
+    MapboxMapAction.invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertEquals("Markers should be empty", 0, mapboxMap.getMarkers().size());
+
+        MarkerOptions options = new MarkerOptions();
+        options.setPosition(new LatLng());
+        options.setSnippet(TestConstants.TEXT_MARKER_SNIPPET);
+        options.setTitle(TestConstants.TEXT_MARKER_TITLE);
+        marker = mapboxMap.addMarker(options);
+
+        assertEquals("Markers size should be 1, ", 1, mapboxMap.getMarkers().size());
+        assertEquals("Marker id should be 0", 0, marker.getId());
+        assertEquals("Marker target should match", new LatLng(), marker.getPosition());
+        assertEquals("Marker snippet should match", TestConstants.TEXT_MARKER_SNIPPET, marker.getSnippet());
+        assertEquals("Marker target should match", TestConstants.TEXT_MARKER_TITLE, marker.getTitle());
+        mapboxMap.clear();
+        assertEquals("Markers should be empty", 0, mapboxMap.getMarkers().size());
+      }
+    });
   }
 
   @Test
   @Ignore
   public void showInfoWindowTest() {
     validateTestSetup();
-
-    final MarkerOptions options = new MarkerOptions();
-    options.setPosition(new LatLng());
-    options.setSnippet(TestConstants.TEXT_MARKER_SNIPPET);
-    options.setTitle(TestConstants.TEXT_MARKER_TITLE);
-
-    onView(withId(R.id.mapView)).perform(new AddMarkerAction(mapboxMap, options));
-    onView(withId(R.id.mapView)).perform(new ShowInfoWindowAction(mapboxMap));
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final MarkerOptions options = new MarkerOptions();
+        options.setPosition(new LatLng());
+        options.setSnippet(TestConstants.TEXT_MARKER_SNIPPET);
+        options.setTitle(TestConstants.TEXT_MARKER_TITLE);
+        marker = mapboxMap.addMarker(options);
+        mapboxMap.selectMarker(marker);
+      }
+    });
     onView(withText(TestConstants.TEXT_MARKER_TITLE)).check(matches(isDisplayed()));
     onView(withText(TestConstants.TEXT_MARKER_SNIPPET)).check(matches(isDisplayed()));
   }
 
-  private class AddMarkerAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private MarkerOptions options;
-
-    AddMarkerAction(MapboxMap map, MarkerOptions markerOptions) {
-      mapboxMap = map;
-      options = markerOptions;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      marker = mapboxMap.addMarker(options);
-    }
-  }
-
-  private class ShowInfoWindowAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-
-    ShowInfoWindowAction(MapboxMap map) {
-      mapboxMap = map;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.selectMarker(marker);
-
-    }
-  }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerViewTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerViewTest.java
index bee20c3150..8bf847c2e7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerViewTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerViewTest.java
@@ -1,28 +1,25 @@
 package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.annotation.MarkerViewActivity;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 import com.mapbox.mapboxsdk.testapp.model.annotations.TextMarkerViewOptions;
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
 
-import org.hamcrest.Matcher;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.assertEquals;
 
 public class MarkerViewTest extends BaseActivityTest {
@@ -38,20 +35,26 @@ public class MarkerViewTest extends BaseActivityTest {
   @Ignore
   public void addMarkerViewTest() {
     validateTestSetup();
-    assertEquals("Markers should be empty", 0, mapboxMap.getMarkers().size());
-
-    TextMarkerViewOptions options = new TextMarkerViewOptions();
-    options.text(TestConstants.TEXT_MARKER_TEXT);
-    options.position(new LatLng());
-    options.snippet(TestConstants.TEXT_MARKER_SNIPPET);
-    options.title(TestConstants.TEXT_MARKER_TITLE);
-
-    onView(withId(R.id.mapView)).perform(new AddTextMarkerViewAction(mapboxMap, options));
-    assertEquals("Markers sze should be 1, ", 1, mapboxMap.getMarkers().size());
-    assertEquals("Marker id should be 0", 0, marker.getId());
-    assertEquals("Marker target should match", new LatLng(), marker.getPosition());
-    assertEquals("Marker snippet should match", TestConstants.TEXT_MARKER_SNIPPET, marker.getSnippet());
-    assertEquals("Marker target should match", TestConstants.TEXT_MARKER_TITLE, marker.getTitle());
+    addAdapter();
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertEquals("Markers should be empty", 0, mapboxMap.getMarkers().size());
+
+        TextMarkerViewOptions options = new TextMarkerViewOptions();
+        options.text(TestConstants.TEXT_MARKER_TEXT);
+        options.position(new LatLng());
+        options.snippet(TestConstants.TEXT_MARKER_SNIPPET);
+        options.title(TestConstants.TEXT_MARKER_TITLE);
+        marker = mapboxMap.addMarker(options);
+        assertEquals("Markers size should be 1, ", 1, mapboxMap.getMarkers().size());
+        assertEquals("Marker id should be 0", 0, marker.getId());
+        assertEquals("Marker target should match", new LatLng(), marker.getPosition());
+        assertEquals("Marker snippet should match", TestConstants.TEXT_MARKER_SNIPPET, marker.getSnippet());
+        assertEquals("Marker target should match", TestConstants.TEXT_MARKER_TITLE, marker.getTitle());
+        uiController.loopMainThreadForAtLeast(500);
+      }
+    });
     onView(withText(TestConstants.TEXT_MARKER_TEXT)).check(matches(isDisplayed()));
   }
 
@@ -59,71 +62,33 @@ public class MarkerViewTest extends BaseActivityTest {
   @Ignore
   public void showInfoWindowTest() {
     validateTestSetup();
-
-    final TextMarkerViewOptions options = new TextMarkerViewOptions();
-    options.position(new LatLng());
-    options.text(TestConstants.TEXT_MARKER_TEXT);
-    options.snippet(TestConstants.TEXT_MARKER_SNIPPET);
-    options.title(TestConstants.TEXT_MARKER_TITLE);
-
-    onView(withId(R.id.mapView)).perform(new AddTextMarkerViewAction(mapboxMap, options));
+    addAdapter();
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final TextMarkerViewOptions options = new TextMarkerViewOptions();
+        options.position(new LatLng());
+        options.text(TestConstants.TEXT_MARKER_TEXT);
+        options.snippet(TestConstants.TEXT_MARKER_SNIPPET);
+        options.title(TestConstants.TEXT_MARKER_TITLE);
+        marker = mapboxMap.addMarker(options);
+        uiController.loopMainThreadForAtLeast(500);
+        mapboxMap.selectMarker(marker);
+      }
+    });
     onView(withText(TestConstants.TEXT_MARKER_TEXT)).check(matches(isDisplayed()));
-    onView(withId(R.id.mapView)).perform(new ShowInfoWindowAction(mapboxMap));
     onView(withText(TestConstants.TEXT_MARKER_TITLE)).check(matches(isDisplayed()));
     onView(withText(TestConstants.TEXT_MARKER_SNIPPET)).check(matches(isDisplayed()));
   }
 
-  private class AddTextMarkerViewAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private TextMarkerViewOptions options;
-
-    AddTextMarkerViewAction(MapboxMap map, TextMarkerViewOptions markerOptions) {
-      mapboxMap = map;
-      options = markerOptions;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.getMarkerViewManager().addMarkerViewAdapter(
-        new MarkerViewActivity.TextAdapter(view.getContext(), mapboxMap));
-      marker = mapboxMap.addMarker(options);
-      uiController.loopMainThreadForAtLeast(250);
-    }
+  private void addAdapter() {
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        mapboxMap.getMarkerViewManager().addMarkerViewAdapter(
+          new MarkerViewActivity.TextAdapter(rule.getActivity(), mapboxMap));
+      }
+    });
   }
 
-  private class ShowInfoWindowAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-
-    ShowInfoWindowAction(MapboxMap map) {
-      mapboxMap = map;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.selectMarker(marker);
-      uiController.loopMainThreadForAtLeast(250);
-    }
-  }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java
index 325568bec4..c90a5f60c6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolygonTest.java
@@ -2,24 +2,19 @@ package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.graphics.Color;
 import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.annotations.Polygon;
 import com.mapbox.mapboxsdk.annotations.PolygonOptions;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
-import org.hamcrest.Matcher;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.assertEquals;
 
 public class PolygonTest extends BaseActivityTest {
@@ -29,60 +24,35 @@ public class PolygonTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private Polygon polygon;
-
   @Test
   @Ignore
-  /** native crash **/
   public void addPolygonTest() {
     validateTestSetup();
-    LatLng latLngOne = new LatLng();
-    LatLng latLngTwo = new LatLng(1, 0);
-    LatLng latLngThree = new LatLng(1, 1);
-
-    assertEquals("Polygons should be empty", 0, mapboxMap.getPolygons().size());
-
-    final PolygonOptions options = new PolygonOptions();
-    options.strokeColor(Color.BLUE);
-    options.fillColor(Color.RED);
-    options.add(latLngOne);
-    options.add(latLngTwo);
-    options.add(latLngThree);
-
-    onView(withId(R.id.mapView)).perform(new AddPolygonAction(mapboxMap, options));
-
-    assertEquals("Polygons should be 1", 1, mapboxMap.getPolygons().size());
-    assertEquals("Polygon id should be 0", 0, polygon.getId());
-    assertEquals("Polygon points size should match", 3, polygon.getPoints().size());
-    assertEquals("Polygon stroke color should match", Color.BLUE, polygon.getStrokeColor());
-    assertEquals("Polygon target should match", Color.RED, polygon.getFillColor());
-    mapboxMap.clear();
-    assertEquals("Polygons should be empty", 0, mapboxMap.getPolygons().size());
-  }
-
-  private class AddPolygonAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private PolygonOptions options;
-
-    AddPolygonAction(MapboxMap map, PolygonOptions polygonOptions) {
-      mapboxMap = map;
-      options = polygonOptions;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      polygon = mapboxMap.addPolygon(options);
-    }
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        LatLng latLngOne = new LatLng();
+        LatLng latLngTwo = new LatLng(1, 0);
+        LatLng latLngThree = new LatLng(1, 1);
+
+        assertEquals("Polygons should be empty", 0, mapboxMap.getPolygons().size());
+
+        final PolygonOptions options = new PolygonOptions();
+        options.strokeColor(Color.BLUE);
+        options.fillColor(Color.RED);
+        options.add(latLngOne);
+        options.add(latLngTwo);
+        options.add(latLngThree);
+        Polygon polygon = mapboxMap.addPolygon(options);
+
+        assertEquals("Polygons should be 1", 1, mapboxMap.getPolygons().size());
+        assertEquals("Polygon id should be 0", 0, polygon.getId());
+        assertEquals("Polygon points size should match", 3, polygon.getPoints().size());
+        assertEquals("Polygon stroke color should match", Color.BLUE, polygon.getStrokeColor());
+        assertEquals("Polygon target should match", Color.RED, polygon.getFillColor());
+        mapboxMap.clear();
+        assertEquals("Polygons should be empty", 0, mapboxMap.getPolygons().size());
+      }
+    });
   }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java
index 91553f7042..e6aa661729 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/PolylineTest.java
@@ -2,82 +2,53 @@ package com.mapbox.mapboxsdk.testapp.annotations;
 
 import android.graphics.Color;
 import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.annotations.Polyline;
 import com.mapbox.mapboxsdk.annotations.PolylineOptions;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
-import org.hamcrest.Matcher;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.assertEquals;
 
 public class PolylineTest extends BaseActivityTest {
 
-  private Polyline polyline;
-
   @Override
   protected Class getActivityClass() {
     return EspressoTestActivity.class;
   }
 
-  @Ignore
   @Test
+  @Ignore
   public void addPolylineTest() {
     validateTestSetup();
-    LatLng latLngOne = new LatLng();
-    LatLng latLngTwo = new LatLng(1, 0);
-
-    assertEquals("Polygons should be empty", 0, mapboxMap.getPolygons().size());
-
-    final PolylineOptions options = new PolylineOptions();
-    options.color(Color.BLUE);
-    options.add(latLngOne);
-    options.add(latLngTwo);
-
-    onView(withId(R.id.mapView)).perform(new AddPolyLineAction(mapboxMap, options));
-
-    assertEquals("Polylines should be 1", 1, mapboxMap.getPolylines().size());
-    assertEquals("Polyline id should be 0", 0, polyline.getId());
-    assertEquals("Polyline points size should match", 2, polyline.getPoints().size());
-    assertEquals("Polyline stroke color should match", Color.BLUE, polyline.getColor());
-    mapboxMap.clear();
-    assertEquals("Polyline should be empty", 0, mapboxMap.getPolylines().size());
-  }
-
-  private class AddPolyLineAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private PolylineOptions options;
-
-    AddPolyLineAction(MapboxMap map, PolylineOptions polylineOptions) {
-      mapboxMap = map;
-      options = polylineOptions;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      polyline = mapboxMap.addPolyline(options);
-    }
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        LatLng latLngOne = new LatLng();
+        LatLng latLngTwo = new LatLng(1, 0);
+
+        assertEquals("Polygons should be empty", 0, mapboxMap.getPolygons().size());
+
+        final PolylineOptions options = new PolylineOptions();
+        options.color(Color.BLUE);
+        options.add(latLngOne);
+        options.add(latLngTwo);
+        Polyline polyline = mapboxMap.addPolyline(options);
+
+        assertEquals("Polylines should be 1", 1, mapboxMap.getPolylines().size());
+        assertEquals("Polyline id should be 0", 0, polyline.getId());
+        assertEquals("Polyline points size should match", 2, polyline.getPoints().size());
+        assertEquals("Polyline stroke color should match", Color.BLUE, polyline.getColor());
+        mapboxMap.clear();
+        assertEquals("Polyline should be empty", 0, mapboxMap.getPolylines().size());
+      }
+    });
   }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java
index af1a146ca2..c16c8f05bb 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java
@@ -2,27 +2,21 @@ package com.mapbox.mapboxsdk.testapp.camera;
 
 import android.graphics.PointF;
 import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
 
-import org.hamcrest.Matcher;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.assertEquals;
 
 public class CameraAnimateTest extends BaseActivityTest {
@@ -36,202 +30,199 @@ public class CameraAnimateTest extends BaseActivityTest {
   @Ignore
   public void testAnimateToCameraPositionTarget() {
     validateTestSetup();
-
-    /*TODO remove zoom #6474*/
-    float zoom = 1.0f;
-    LatLng moveTarget = new LatLng(1, 1);
-
-    CameraPosition initialPosition = new CameraPosition.Builder().target(
-      new LatLng()).zoom(zoom).bearing(0).tilt(0).build();
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Default camera position should match default", cameraPosition, initialPosition);
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.newLatLng(moveTarget)));
-    cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        LatLng moveTarget = new LatLng(1, 1);
+        CameraPosition initialPosition = new CameraPosition.Builder().target(
+          new LatLng()).zoom(zoom).bearing(0).tilt(0).build();
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Default camera position should match default", cameraPosition, initialPosition);
+        mapboxMap.animateCamera(CameraUpdateFactory.newLatLng(moveTarget));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToCameraPositionTargetZoom() {
     validateTestSetup();
-
-    final float moveZoom = 15.5f;
-    final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngZoom(moveTarget, moveZoom)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final float moveZoom = 15.5f;
+        final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
+        mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(moveTarget, moveZoom));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToCameraPosition() {
     validateTestSetup();
-
-    final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
-    final float moveZoom = 15.5f;
-    final float moveTilt = 45.5f;
-    final float moveBearing = 12.5f;
-
-    onView(withId(R.id.mapView)).perform(
-      new AnimateCameraAction(mapboxMap, CameraUpdateFactory.newCameraPosition(
-        new CameraPosition.Builder()
-          .target(moveTarget)
-          .zoom(moveZoom)
-          .tilt(moveTilt)
-          .bearing(moveBearing)
-          .build()))
-    );
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.tilt, moveTilt, TestConstants.TILT_DELTA);
-    assertEquals("Moved bearing should match", cameraPosition.bearing, moveBearing, TestConstants.BEARING_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
+        final float moveZoom = 15.5f;
+        final float moveTilt = 45.5f;
+        final float moveBearing = 12.5f;
+
+        mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(
+          new CameraPosition.Builder()
+            .target(moveTarget)
+            .zoom(moveZoom)
+            .tilt(moveTilt)
+            .bearing(moveBearing)
+            .build())
+        );
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.tilt, moveTilt, TestConstants.TILT_DELTA);
+        assertEquals("Moved bearing should match", cameraPosition.bearing, moveBearing, TestConstants.BEARING_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToBounds() {
     validateTestSetup();
-
-    final LatLng centerBounds = new LatLng(1, 1);
-    LatLng cornerOne = new LatLng();
-    LatLng cornerTwo = new LatLng(2, 2);
-
-    final LatLngBounds.Builder builder = new LatLngBounds.Builder();
-    builder.include(cornerOne);
-    builder.include(cornerTwo);
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngBounds(builder.build(), 0)));
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match center bounds",
-      cameraPosition.target.getLatitude(),
-      centerBounds.getLatitude(),
-      TestConstants.LAT_LNG_DELTA);
-
-    assertEquals("Moved camera position longitude should match center bounds",
-      cameraPosition.target.getLongitude(),
-      centerBounds.getLongitude(),
-      TestConstants.LAT_LNG_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final LatLng centerBounds = new LatLng(1, 1);
+        LatLng cornerOne = new LatLng();
+        LatLng cornerTwo = new LatLng(2, 2);
+        final LatLngBounds.Builder builder = new LatLngBounds.Builder();
+        builder.include(cornerOne);
+        builder.include(cornerTwo);
+        mapboxMap.animateCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 0));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match center bounds",
+          cameraPosition.target.getLatitude(),
+          centerBounds.getLatitude(),
+          TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match center bounds",
+          cameraPosition.target.getLongitude(),
+          centerBounds.getLongitude(),
+          TestConstants.LAT_LNG_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToMoveBy() {
     validateTestSetup();
-
-    final PointF centerPoint = mapboxMap.getProjection().toScreenLocation(mapboxMap.getCameraPosition().target);
-    final LatLng moveTarget = new LatLng(2, 2);
-    final PointF moveTargetPoint = mapboxMap.getProjection().toScreenLocation(moveTarget);
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.scrollBy(
-      moveTargetPoint.x - centerPoint.x, moveTargetPoint.y - centerPoint.y)));
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA_LARGE);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final PointF centerPoint = mapboxMap.getProjection().toScreenLocation(mapboxMap.getCameraPosition().target);
+        final LatLng moveTarget = new LatLng(2, 2);
+        final PointF moveTargetPoint = mapboxMap.getProjection().toScreenLocation(moveTarget);
+        mapboxMap.animateCamera(CameraUpdateFactory.scrollBy(
+          moveTargetPoint.x - centerPoint.x, moveTargetPoint.y - centerPoint.y));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToZoomIn() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 1.0f;
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.zoomIn()));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + 1,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomIn());
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + 1,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToZoomOut() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 10.0f;
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngZoom(new LatLng(), zoom)));
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.zoomOut()));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom - 1,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 10.0f;
+        mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(), zoom));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomOut());
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom - 1,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToZoomBy() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 1.0f;
-    final float zoomBy = 2.45f;
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.zoomBy(zoomBy)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + zoomBy,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        final float zoomBy = 2.45f;
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomBy(zoomBy));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + zoomBy,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testAnimateToZoomTo() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    final float zoomTo = 2.45f;
-
-    onView(withId(R.id.mapView)).perform(new AnimateCameraAction(mapboxMap, CameraUpdateFactory.zoomTo(zoomTo)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoomTo,
-      TestConstants.ZOOM_DELTA);
-  }
-
-  private class AnimateCameraAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private CameraUpdate cameraUpdate;
-
-    AnimateCameraAction(MapboxMap map, CameraUpdate update) {
-      mapboxMap = map;
-      cameraUpdate = update;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.animateCamera(cameraUpdate);
-      uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
-    }
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final float zoomTo = 2.45f;
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomTo(zoomTo));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoomTo,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 }
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
index 4fae894039..8c67af7da3 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
@@ -2,27 +2,21 @@ package com.mapbox.mapboxsdk.testapp.camera;
 
 import android.graphics.PointF;
 import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
 
-import org.hamcrest.Matcher;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.assertEquals;
 
 public class CameraEaseTest extends BaseActivityTest {
@@ -36,201 +30,198 @@ public class CameraEaseTest extends BaseActivityTest {
   @Ignore
   public void testEaseToCameraPositionTarget() {
     validateTestSetup();
-
-    /*TODO remove zoom #6474*/
-    float zoom = 1.0f;
-    LatLng moveTarget = new LatLng(1, 1);
-
-    CameraPosition initialPosition = new CameraPosition.Builder().target(
-      new LatLng()).zoom(zoom).bearing(0).tilt(0).build();
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Default camera position should match default", cameraPosition, initialPosition);
-
-    onView(withId(R.id.mapView)).perform(new EaseCameraAction(mapboxMap, CameraUpdateFactory.newLatLng(moveTarget)));
-    cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        LatLng moveTarget = new LatLng(1, 1);
+        CameraPosition initialPosition = new CameraPosition.Builder().target(
+          new LatLng()).zoom(zoom).bearing(0).tilt(0).build();
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Default camera position should match default", cameraPosition, initialPosition);
+        mapboxMap.easeCamera(CameraUpdateFactory.newLatLng(moveTarget));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testEaseToCameraPositionTargetZoom() {
     validateTestSetup();
-
-    final float moveZoom = 15.5f;
-    final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
-
-    onView(withId(R.id.mapView)).perform(new EaseCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngZoom(moveTarget, moveZoom)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final float moveZoom = 15.5f;
+        final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
+        mapboxMap.easeCamera(CameraUpdateFactory.newLatLngZoom(moveTarget, moveZoom));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testEaseToCameraPosition() {
     validateTestSetup();
-
-    final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
-    final float moveZoom = 15.5f;
-    final float moveTilt = 45.5f;
-    final float moveBearing = 12.5f;
-
-    onView(withId(R.id.mapView)).perform(
-      new EaseCameraAction(mapboxMap, CameraUpdateFactory.newCameraPosition(
-        new CameraPosition.Builder()
-          .target(moveTarget)
-          .zoom(moveZoom)
-          .tilt(moveTilt)
-          .bearing(moveBearing)
-          .build()))
-    );
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.tilt, moveTilt, TestConstants.TILT_DELTA);
-    assertEquals("Moved bearing should match", cameraPosition.bearing, moveBearing, TestConstants.BEARING_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
+        final float moveZoom = 15.5f;
+        final float moveTilt = 45.5f;
+        final float moveBearing = 12.5f;
+
+        mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(
+          new CameraPosition.Builder()
+            .target(moveTarget)
+            .zoom(moveZoom)
+            .tilt(moveTilt)
+            .bearing(moveBearing)
+            .build())
+        );
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.tilt, moveTilt, TestConstants.TILT_DELTA);
+        assertEquals("Moved bearing should match", cameraPosition.bearing, moveBearing, TestConstants.BEARING_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testEaseToBounds() {
     validateTestSetup();
-
-    final LatLng centerBounds = new LatLng(1, 1);
-    LatLng cornerOne = new LatLng();
-    LatLng cornerTwo = new LatLng(2, 2);
-
-    final LatLngBounds.Builder builder = new LatLngBounds.Builder();
-    builder.include(cornerOne);
-    builder.include(cornerTwo);
-
-    onView(withId(R.id.mapView)).perform(new EaseCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngBounds(builder.build(), 0)));
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match center bounds",
-      cameraPosition.target.getLatitude(),
-      centerBounds.getLatitude(),
-      TestConstants.LAT_LNG_DELTA);
-
-    assertEquals("Moved camera position longitude should match center bounds",
-      cameraPosition.target.getLongitude(),
-      centerBounds.getLongitude(),
-      TestConstants.LAT_LNG_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final LatLng centerBounds = new LatLng(1, 1);
+        LatLng cornerOne = new LatLng();
+        LatLng cornerTwo = new LatLng(2, 2);
+        final LatLngBounds.Builder builder = new LatLngBounds.Builder();
+        builder.include(cornerOne);
+        builder.include(cornerTwo);
+        mapboxMap.easeCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 0));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match center bounds",
+          cameraPosition.target.getLatitude(),
+          centerBounds.getLatitude(),
+          TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match center bounds",
+          cameraPosition.target.getLongitude(),
+          centerBounds.getLongitude(),
+          TestConstants.LAT_LNG_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testEaseToMoveBy() {
     validateTestSetup();
-
-    final PointF centerPoint = mapboxMap.getProjection().toScreenLocation(mapboxMap.getCameraPosition().target);
-    final LatLng moveTarget = new LatLng(2, 2);
-    final PointF moveTargetPoint = mapboxMap.getProjection().toScreenLocation(moveTarget);
-
-    onView(withId(R.id.mapView)).perform(new EaseCameraAction(mapboxMap, CameraUpdateFactory.scrollBy(
-      moveTargetPoint.x - centerPoint.x, moveTargetPoint.y - centerPoint.y)));
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA_LARGE);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final PointF centerPoint = mapboxMap.getProjection().toScreenLocation(mapboxMap.getCameraPosition().target);
+        final LatLng moveTarget = new LatLng(2, 2);
+        final PointF moveTargetPoint = mapboxMap.getProjection().toScreenLocation(moveTarget);
+        mapboxMap.easeCamera(CameraUpdateFactory.scrollBy(
+          moveTargetPoint.x - centerPoint.x, moveTargetPoint.y - centerPoint.y));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testEaseToZoomIn() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 1.0f;
-
-    onView(withId(R.id.mapView)).perform(new EaseCameraAction(mapboxMap, CameraUpdateFactory.zoomIn()));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + 1,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        mapboxMap.easeCamera(CameraUpdateFactory.zoomIn());
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + 1,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testEaseToZoomOut() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 10.0f;
-    onView(withId(R.id.mapView)).perform(new EaseCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngZoom(new LatLng(), zoom)));
-    onView(withId(R.id.mapView)).perform(new EaseCameraAction(mapboxMap, CameraUpdateFactory.zoomOut()));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", 9, cameraPosition.zoom, TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 10.0f;
+        mapboxMap.easeCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(), zoom));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        mapboxMap.easeCamera(CameraUpdateFactory.zoomOut());
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom - 1,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testEaseToZoomBy() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 1.0f;
-    final float zoomBy = 2.45f;
-
-    onView(withId(R.id.mapView)).perform(new EaseCameraAction(mapboxMap, CameraUpdateFactory.zoomBy(zoomBy)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + zoomBy,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        final float zoomBy = 2.45f;
+        mapboxMap.easeCamera(CameraUpdateFactory.zoomBy(zoomBy));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + zoomBy,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testEaseToZoomTo() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    final float zoomTo = 2.45f;
-
-    onView(withId(R.id.mapView)).perform(new EaseCameraAction(mapboxMap, CameraUpdateFactory.zoomTo(zoomTo)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoomTo,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final float zoomTo = 2.45f;
+        mapboxMap.easeCamera(CameraUpdateFactory.zoomTo(zoomTo));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoomTo,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
-
-  private class EaseCameraAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private CameraUpdate cameraUpdate;
-
-    EaseCameraAction(MapboxMap map, CameraUpdate update) {
-      mapboxMap = map;
-      cameraUpdate = update;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.easeCamera(cameraUpdate);
-      uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
-    }
-  }
-}
-
+}
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java
index ea8398fc8e..54590981fa 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraMoveTest.java
@@ -2,27 +2,21 @@ package com.mapbox.mapboxsdk.testapp.camera;
 
 import android.graphics.PointF;
 import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
 
-import org.hamcrest.Matcher;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.assertEquals;
 
 public class CameraMoveTest extends BaseActivityTest {
@@ -36,201 +30,199 @@ public class CameraMoveTest extends BaseActivityTest {
   @Ignore
   public void testMoveToCameraPositionTarget() {
     validateTestSetup();
-
-    /*TODO remove zoom #6474*/
-    float zoom = 1.0f;
-    LatLng moveTarget = new LatLng(1, 1);
-
-    CameraPosition initialPosition = new CameraPosition.Builder().target(
-      new LatLng()).zoom(zoom).bearing(0).tilt(0).build();
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Default camera position should match default", cameraPosition, initialPosition);
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap, CameraUpdateFactory.newLatLng(moveTarget)));
-    cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        LatLng moveTarget = new LatLng(1, 1);
+        CameraPosition initialPosition = new CameraPosition.Builder().target(
+          new LatLng()).zoom(zoom).bearing(0).tilt(0).build();
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Default camera position should match default", cameraPosition, initialPosition);
+        mapboxMap.moveCamera(CameraUpdateFactory.newLatLng(moveTarget));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testMoveToCameraPositionTargetZoom() {
     validateTestSetup();
-
-    final float moveZoom = 15.5f;
-    final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngZoom(moveTarget, moveZoom)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final float moveZoom = 15.5f;
+        final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
+        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(moveTarget, moveZoom));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testMoveToCameraPosition() {
     validateTestSetup();
-
-    final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
-    final float moveZoom = 15.5f;
-    final float moveTilt = 45.5f;
-    final float moveBearing = 12.5f;
-
-    onView(withId(R.id.mapView)).perform(
-      new MoveCameraAction(mapboxMap, CameraUpdateFactory.newCameraPosition(
-        new CameraPosition.Builder()
-          .target(moveTarget)
-          .zoom(moveZoom)
-          .tilt(moveTilt)
-          .bearing(moveBearing)
-          .build()))
-    );
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
-    assertEquals("Moved zoom should match", cameraPosition.tilt, moveTilt, TestConstants.TILT_DELTA);
-    assertEquals("Moved bearing should match", cameraPosition.bearing, moveBearing, TestConstants.BEARING_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003);
+        final float moveZoom = 15.5f;
+        final float moveTilt = 45.5f;
+        final float moveBearing = 12.5f;
+
+        mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(
+          new CameraPosition.Builder()
+            .target(moveTarget)
+            .zoom(moveZoom)
+            .tilt(moveTilt)
+            .bearing(moveBearing)
+            .build())
+        );
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.zoom, moveZoom, TestConstants.ZOOM_DELTA);
+        assertEquals("Moved zoom should match", cameraPosition.tilt, moveTilt, TestConstants.TILT_DELTA);
+        assertEquals("Moved bearing should match", cameraPosition.bearing, moveBearing, TestConstants.BEARING_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testMoveToBounds() {
     validateTestSetup();
-
-    final LatLng centerBounds = new LatLng(1, 1);
-    LatLng cornerOne = new LatLng();
-    LatLng cornerTwo = new LatLng(2, 2);
-
-    final LatLngBounds.Builder builder = new LatLngBounds.Builder();
-    builder.include(cornerOne);
-    builder.include(cornerTwo);
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngBounds(builder.build(), 0)));
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match center bounds",
-      cameraPosition.target.getLatitude(),
-      centerBounds.getLatitude(),
-      TestConstants.LAT_LNG_DELTA);
-
-    assertEquals("Moved camera position longitude should match center bounds",
-      cameraPosition.target.getLongitude(),
-      centerBounds.getLongitude(),
-      TestConstants.LAT_LNG_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final LatLng centerBounds = new LatLng(1, 1);
+        LatLng cornerOne = new LatLng();
+        LatLng cornerTwo = new LatLng(2, 2);
+        final LatLngBounds.Builder builder = new LatLngBounds.Builder();
+        builder.include(cornerOne);
+        builder.include(cornerTwo);
+        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 0));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match center bounds",
+          cameraPosition.target.getLatitude(),
+          centerBounds.getLatitude(),
+          TestConstants.LAT_LNG_DELTA);
+        assertEquals("Moved camera position longitude should match center bounds",
+          cameraPosition.target.getLongitude(),
+          centerBounds.getLongitude(),
+          TestConstants.LAT_LNG_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testMoveToMoveBy() {
     validateTestSetup();
-
-    final PointF centerPoint = mapboxMap.getProjection().toScreenLocation(mapboxMap.getCameraPosition().target);
-    final LatLng moveTarget = new LatLng(2, 2);
-    final PointF moveTargetPoint = mapboxMap.getProjection().toScreenLocation(moveTarget);
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap, CameraUpdateFactory.scrollBy(
-      moveTargetPoint.x - centerPoint.x, moveTargetPoint.y - centerPoint.y)));
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
-      moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA_LARGE);
-    assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
-      moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final PointF centerPoint = mapboxMap.getProjection().toScreenLocation(mapboxMap.getCameraPosition().target);
+        final LatLng moveTarget = new LatLng(2, 2);
+        final PointF moveTargetPoint = mapboxMap.getProjection().toScreenLocation(moveTarget);
+        mapboxMap.moveCamera(CameraUpdateFactory.scrollBy(
+          moveTargetPoint.x - centerPoint.x, moveTargetPoint.y - centerPoint.y));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera position latitude should match", cameraPosition.target.getLatitude(),
+          moveTarget.getLatitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+        assertEquals("Moved camera position longitude should match", cameraPosition.target.getLongitude(),
+          moveTarget.getLongitude(), TestConstants.LAT_LNG_DELTA_LARGE);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testMoveToZoomIn() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 1.0f;
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap, CameraUpdateFactory.zoomIn()));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + 1,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        mapboxMap.moveCamera(CameraUpdateFactory.zoomIn());
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + 1,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testMoveToZoomOut() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 10.0f;
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap,
-      CameraUpdateFactory.newLatLngZoom(new LatLng(), zoom)));
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap, CameraUpdateFactory.zoomOut()));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom - 1,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 10.0f;
+        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(), zoom));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        mapboxMap.moveCamera(CameraUpdateFactory.zoomOut());
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom - 1,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testMoveToZoomBy() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    float zoom = 1.0f;
-    final float zoomBy = 2.45f;
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap, CameraUpdateFactory.zoomBy(zoomBy)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + zoomBy,
-      TestConstants.ZOOM_DELTA);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        float zoom = 1.0f;
+        final float zoomBy = 2.45f;
+        mapboxMap.moveCamera(CameraUpdateFactory.zoomBy(zoomBy));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoom + zoomBy,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 
   @Test
   @Ignore
   public void testMoveToZoomTo() {
     validateTestSetup();
-
-    /*TODO fix zoom #6474*/
-    final float zoomTo = 2.45f;
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap, CameraUpdateFactory.zoomTo(zoomTo)));
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoomTo,
-      TestConstants.ZOOM_DELTA);
-  }
-
-  private class MoveCameraAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private CameraUpdate cameraUpdate;
-
-    MoveCameraAction(MapboxMap map, CameraUpdate update) {
-      mapboxMap = map;
-      cameraUpdate = update;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.moveCamera(cameraUpdate);
-      uiController.loopMainThreadForAtLeast(100);
-    }
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        final float zoomTo = 2.45f;
+        mapboxMap.moveCamera(CameraUpdateFactory.zoomTo(zoomTo));
+        uiController.loopMainThreadForAtLeast(TestConstants.ANIMATION_TEST_TIME);
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Moved camera zoom should match moved camera zoom", cameraPosition.zoom, zoomTo,
+          TestConstants.ZOOM_DELTA);
+      }
+    });
   }
 }
+
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java
index f15605042b..28389a3386 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java
@@ -1,20 +1,17 @@
 package com.mapbox.mapboxsdk.testapp.maps.widgets;
 
 import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
 
 import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
 
-import org.hamcrest.Matcher;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -23,6 +20,7 @@ import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 
@@ -40,96 +38,51 @@ public class CompassViewTest extends BaseActivityTest {
   }
 
   @Test
+  @Ignore
   public void testVisible() {
     validateTestSetup();
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap,
-        CameraUpdateFactory.newCameraPosition(
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(
           new CameraPosition.Builder()
             .bearing(45)
             .zoom(1)
             .target(new LatLng())
             .build()
-        )
-      )
-    );
-    waitLoop();
+        ));
+        uiController.loopMainThreadForAtLeast(500);
+      }
+    });
     onView(withId(R.id.compassView)).check(matches(isDisplayed()));
   }
 
   @Test
-  @Ignore // 10-31-2016 click action is not working
+  @Ignore
   public void testClick() {
     validateTestSetup();
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap,
-        CameraUpdateFactory.newCameraPosition(
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(
           new CameraPosition.Builder()
             .bearing(45)
             .zoom(1)
             .target(new LatLng())
             .build()
-        )
-      )
-    );
-
-    waitLoop();
+        ));
+      }
+    });
     onView(withId(R.id.compassView)).perform(click());
-    onView(withId(R.id.mapView)).perform(new WaitAction(3000));
+    waitLoop();
     onView(withId(R.id.compassView)).check(matches(not(isDisplayed())));
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Camera bearing should face north, ", 0, cameraPosition.bearing, TestConstants.BEARING_DELTA);
-  }
-
-  private class WaitAction implements ViewAction {
-
-    private long waitTime;
-
-    WaitAction(long waitTime) {
-      this.waitTime = waitTime;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      uiController.loopMainThreadForAtLeast(waitTime);
-    }
-  }
-
-  private class MoveCameraAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private CameraUpdate cameraUpdate;
-
-    MoveCameraAction(MapboxMap map, CameraUpdate update) {
-      mapboxMap = map;
-      cameraUpdate = update;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.moveCamera(cameraUpdate);
-    }
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        CameraPosition cameraPosition = mapboxMap.getCameraPosition();
+        assertEquals("Camera bearing should face north, ", 0, cameraPosition.bearing, TestConstants.BEARING_DELTA);
+      }
+    });
   }
 }
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java
index 851660f06e..0e4cf6a8ca 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java
@@ -3,9 +3,9 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
+
 import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -19,20 +19,16 @@ import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
 import com.mapbox.mapboxsdk.style.layers.BackgroundLayer;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static com.mapbox.mapboxsdk.style.functions.Function.*;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
@@ -53,9 +49,14 @@ public class BackgroundLayerTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private void setupLayer(){
+  private void setupLayer() {
     Timber.i("Retrieving layer");
-    layer = mapboxMap.getLayerAs("background");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        layer = mapboxMap.getLayerAs("background");
+      }
+    });
   }
 
   @Test
@@ -63,14 +64,19 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
-
-    // Get initial
-    assertEquals(layer.getVisibility().getValue(), VISIBLE);
-
-    // Set
-    layer.setProperties(visibility(NONE));
-    assertEquals(layer.getVisibility().getValue(), NONE);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Get initial
+        assertEquals(layer.getVisibility().getValue(), VISIBLE);
+
+        // Set
+        layer.setProperties(visibility(NONE));
+        assertEquals(layer.getVisibility().getValue(), NONE);
+      }
+    });
   }
 
   @Test
@@ -78,12 +84,17 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-colorTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setBackgroundColorTransition(options);
-    assertEquals(layer.getBackgroundColorTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setBackgroundColorTransition(options);
+        assertEquals(layer.getBackgroundColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -91,11 +102,16 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-color");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(backgroundColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getBackgroundColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(backgroundColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getBackgroundColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -103,26 +119,31 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      backgroundColor(
-        zoom(
-          exponential(
-            stop(2, backgroundColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getBackgroundColor());
-    assertNotNull(layer.getBackgroundColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getBackgroundColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getBackgroundColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getBackgroundColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getBackgroundColor().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          backgroundColor(
+            zoom(
+              exponential(
+                stop(2, backgroundColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getBackgroundColor());
+        assertNotNull(layer.getBackgroundColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getBackgroundColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getBackgroundColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getBackgroundColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getBackgroundColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -130,11 +151,16 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-color");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(backgroundColor(Color.RED));
-    assertEquals(layer.getBackgroundColorAsInt(), Color.RED);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(backgroundColor(Color.RED));
+        assertEquals(layer.getBackgroundColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -142,12 +168,17 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-patternTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setBackgroundPatternTransition(options);
-    assertEquals(layer.getBackgroundPatternTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setBackgroundPatternTransition(options);
+        assertEquals(layer.getBackgroundPatternTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -155,11 +186,16 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-pattern");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(backgroundPattern("pedestrian-polygon"));
-    assertEquals((String) layer.getBackgroundPattern().getValue(), (String) "pedestrian-polygon");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(backgroundPattern("pedestrian-polygon"));
+        assertEquals((String) layer.getBackgroundPattern().getValue(), (String) "pedestrian-polygon");
+      }
+    });
   }
 
   @Test
@@ -167,25 +203,30 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-pattern");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      backgroundPattern(
-        zoom(
-          interval(
-            stop(2, backgroundPattern("pedestrian-polygon"))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          backgroundPattern(
+            zoom(
+              interval(
+                stop(2, backgroundPattern("pedestrian-polygon"))
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getBackgroundPattern());
-    assertNotNull(layer.getBackgroundPattern().getFunction());
-    assertEquals(CameraFunction.class, layer.getBackgroundPattern().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getBackgroundPattern().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getBackgroundPattern().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getBackgroundPattern());
+        assertNotNull(layer.getBackgroundPattern().getFunction());
+        assertEquals(CameraFunction.class, layer.getBackgroundPattern().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getBackgroundPattern().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getBackgroundPattern().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -193,12 +234,17 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-opacityTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setBackgroundOpacityTransition(options);
-    assertEquals(layer.getBackgroundOpacityTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setBackgroundOpacityTransition(options);
+        assertEquals(layer.getBackgroundOpacityTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -206,11 +252,16 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-opacity");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(backgroundOpacity(0.3f));
-    assertEquals((Float) layer.getBackgroundOpacity().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(backgroundOpacity(0.3f));
+        assertEquals((Float) layer.getBackgroundOpacity().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -218,26 +269,31 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      backgroundOpacity(
-        zoom(
-          exponential(
-            stop(2, backgroundOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getBackgroundOpacity());
-    assertNotNull(layer.getBackgroundOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getBackgroundOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getBackgroundOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getBackgroundOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getBackgroundOpacity().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          backgroundOpacity(
+            zoom(
+              exponential(
+                stop(2, backgroundOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getBackgroundOpacity());
+        assertNotNull(layer.getBackgroundOpacity().getFunction());
+        assertEquals(CameraFunction.class, layer.getBackgroundOpacity().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getBackgroundOpacity().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getBackgroundOpacity().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getBackgroundOpacity().getFunction().getStops()).size());
+      }
+    });
   }
 
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BaseStyleTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BaseStyleTest.java
deleted file mode 100644
index 3d56752150..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BaseStyleTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.style;
-
-import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-
-/**
- * Base Test class for Style tests
- */
-public class BaseStyleTest extends BaseActivityTest {
-
-  @Override
-  protected Class getActivityClass() {
-    return RuntimeStyleTestActivity.class;
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
index bf31a935f8..c8f9640433 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
@@ -3,9 +3,9 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
+
 import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -19,20 +19,16 @@ import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static com.mapbox.mapboxsdk.style.functions.Function.*;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
@@ -53,15 +49,21 @@ public class CircleLayerTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private void setupLayer(){
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new CircleLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  private void setupLayer() {
+    Timber.i("Retrieving layer");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
+          Timber.i("Adding layer");
+          layer = new CircleLayer("my-layer", "composite");
+          layer.setSourceLayer("composite");
+          mapboxMap.addLayer(layer);
+          // Layer reference is now stale, get new reference
+          layer = mapboxMap.getLayerAs("my-layer");
+        }
+      }
+    });
   }
 
   @Test
@@ -69,14 +71,19 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
-
-    // Get initial
-    assertEquals(layer.getVisibility().getValue(), VISIBLE);
-
-    // Set
-    layer.setProperties(visibility(NONE));
-    assertEquals(layer.getVisibility().getValue(), NONE);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Get initial
+        assertEquals(layer.getVisibility().getValue(), VISIBLE);
+
+        // Set
+        layer.setProperties(visibility(NONE));
+        assertEquals(layer.getVisibility().getValue(), NONE);
+      }
+    });
   }
 
   @Test
@@ -84,15 +91,20 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    assertNotNull(layer);
-
-    // Get initial
-    assertEquals(layer.getSourceLayer(), "composite");
-
-    // Set
-    final String sourceLayer = "test";
-    layer.setSourceLayer(sourceLayer);
-    assertEquals(layer.getSourceLayer(), sourceLayer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Get initial
+        assertEquals(layer.getSourceLayer(), "composite");
+
+        // Set
+        final String sourceLayer = "test";
+        layer.setSourceLayer(sourceLayer);
+        assertEquals(layer.getSourceLayer(), sourceLayer);
+      }
+    });
   }
 
   @Test
@@ -100,12 +112,17 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radiusTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setCircleRadiusTransition(options);
-    assertEquals(layer.getCircleRadiusTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setCircleRadiusTransition(options);
+        assertEquals(layer.getCircleRadiusTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -113,11 +130,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleRadius(0.3f));
-    assertEquals((Float) layer.getCircleRadius().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleRadius(0.3f));
+        assertEquals((Float) layer.getCircleRadius().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -125,26 +147,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleRadius(
-        zoom(
-          exponential(
-            stop(2, circleRadius(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleRadius());
-    assertNotNull(layer.getCircleRadius().getFunction());
-    assertEquals(CameraFunction.class, layer.getCircleRadius().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getCircleRadius().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getCircleRadius().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getCircleRadius().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleRadius(
+            zoom(
+              exponential(
+                stop(2, circleRadius(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleRadius());
+        assertNotNull(layer.getCircleRadius().getFunction());
+        assertEquals(CameraFunction.class, layer.getCircleRadius().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getCircleRadius().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getCircleRadius().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getCircleRadius().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -152,19 +179,24 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleRadius(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleRadius());
-    assertNotNull(layer.getCircleRadius().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleRadius().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleRadius().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getCircleRadius().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleRadius(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleRadius());
+        assertNotNull(layer.getCircleRadius().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleRadius().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleRadius().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getCircleRadius().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -172,26 +204,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleRadius(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, circleRadius(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleRadius());
-    assertNotNull(layer.getCircleRadius().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleRadius().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleRadius().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleRadius().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleRadius(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, circleRadius(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleRadius());
+        assertNotNull(layer.getCircleRadius().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleRadius().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleRadius().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleRadius().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -199,29 +236,35 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleRadius(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, circleRadius(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleRadius(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, circleRadius(0.3f))
+              )
+            ).withDefaultValue(circleRadius(0.3f))
           )
-        ).withDefaultValue(circleRadius(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleRadius());
-    assertNotNull(layer.getCircleRadius().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleRadius().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleRadius().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getCircleRadius().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getCircleRadius().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getCircleRadius().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getCircleRadius().getFunction()).getDefaultValue().getValue());
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleRadius());
+        assertNotNull(layer.getCircleRadius().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleRadius().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleRadius().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getCircleRadius().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getCircleRadius().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getCircleRadius().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getCircleRadius().getFunction()).getDefaultValue().getValue());
+      }
+    });
+
   }
 
   @Test
@@ -229,34 +272,39 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleRadius(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, circleRadius(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(circleRadius(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleRadius());
-    assertNotNull(layer.getCircleRadius().getFunction());
-    assertEquals(CompositeFunction.class, layer.getCircleRadius().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleRadius().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleRadius().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getCircleRadius().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleRadius().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleRadius(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, circleRadius(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(circleRadius(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleRadius());
+        assertNotNull(layer.getCircleRadius().getFunction());
+        assertEquals(CompositeFunction.class, layer.getCircleRadius().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleRadius().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleRadius().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getCircleRadius().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleRadius().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -264,12 +312,17 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-colorTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setCircleColorTransition(options);
-    assertEquals(layer.getCircleColorTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setCircleColorTransition(options);
+        assertEquals(layer.getCircleColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -277,11 +330,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getCircleColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getCircleColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -289,26 +347,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleColor(
-        zoom(
-          exponential(
-            stop(2, circleColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleColor());
-    assertNotNull(layer.getCircleColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getCircleColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getCircleColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getCircleColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getCircleColor().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleColor(
+            zoom(
+              exponential(
+                stop(2, circleColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleColor());
+        assertNotNull(layer.getCircleColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getCircleColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getCircleColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getCircleColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getCircleColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -316,19 +379,24 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleColor());
-    assertNotNull(layer.getCircleColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getCircleColor().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleColor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleColor());
+        assertNotNull(layer.getCircleColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleColor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getCircleColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -336,26 +404,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, circleColor(Color.RED))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleColor());
-    assertNotNull(layer.getCircleColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleColor().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleColor(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(Color.RED, circleColor(Color.RED))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleColor());
+        assertNotNull(layer.getCircleColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleColor().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -363,29 +436,35 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", circleColor(Color.RED))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleColor(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop("valueA", circleColor(Color.RED))
+              )
+            ).withDefaultValue(circleColor(Color.GREEN))
           )
-        ).withDefaultValue(circleColor(Color.GREEN))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleColor());
-    assertNotNull(layer.getCircleColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getCircleColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getCircleColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getCircleColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getCircleColor().getFunction()).getDefaultValue().getColorInt());
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleColor());
+        assertNotNull(layer.getCircleColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleColor().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getCircleColor().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getCircleColor().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getCircleColor().getFunction()).getDefaultValue().getValue());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getCircleColor().getFunction()).getDefaultValue().getColorInt());
+      }
+    });
+
   }
 
   @Test
@@ -393,11 +472,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleColor(Color.RED));
-    assertEquals(layer.getCircleColorAsInt(), Color.RED);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleColor(Color.RED));
+        assertEquals(layer.getCircleColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -405,12 +489,17 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blurTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setCircleBlurTransition(options);
-    assertEquals(layer.getCircleBlurTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setCircleBlurTransition(options);
+        assertEquals(layer.getCircleBlurTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -418,11 +507,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleBlur(0.3f));
-    assertEquals((Float) layer.getCircleBlur().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleBlur(0.3f));
+        assertEquals((Float) layer.getCircleBlur().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -430,26 +524,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleBlur(
-        zoom(
-          exponential(
-            stop(2, circleBlur(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleBlur());
-    assertNotNull(layer.getCircleBlur().getFunction());
-    assertEquals(CameraFunction.class, layer.getCircleBlur().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getCircleBlur().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getCircleBlur().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleBlur(
+            zoom(
+              exponential(
+                stop(2, circleBlur(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleBlur());
+        assertNotNull(layer.getCircleBlur().getFunction());
+        assertEquals(CameraFunction.class, layer.getCircleBlur().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getCircleBlur().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getCircleBlur().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -457,19 +556,24 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleBlur(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleBlur());
-    assertNotNull(layer.getCircleBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleBlur().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleBlur(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleBlur());
+        assertNotNull(layer.getCircleBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleBlur().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -477,26 +581,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleBlur(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, circleBlur(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleBlur());
-    assertNotNull(layer.getCircleBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleBlur().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleBlur(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, circleBlur(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleBlur());
+        assertNotNull(layer.getCircleBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleBlur().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -504,29 +613,35 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleBlur(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, circleBlur(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleBlur(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, circleBlur(0.3f))
+              )
+            ).withDefaultValue(circleBlur(0.3f))
           )
-        ).withDefaultValue(circleBlur(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleBlur());
-    assertNotNull(layer.getCircleBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleBlur().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getCircleBlur().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getCircleBlur().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getCircleBlur().getFunction()).getDefaultValue().getValue());
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleBlur());
+        assertNotNull(layer.getCircleBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleBlur().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getCircleBlur().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getCircleBlur().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getCircleBlur().getFunction()).getDefaultValue().getValue());
+      }
+    });
+
   }
 
   @Test
@@ -534,34 +649,39 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleBlur(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, circleBlur(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(circleBlur(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleBlur());
-    assertNotNull(layer.getCircleBlur().getFunction());
-    assertEquals(CompositeFunction.class, layer.getCircleBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleBlur().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getCircleBlur().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleBlur().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleBlur(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, circleBlur(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(circleBlur(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleBlur());
+        assertNotNull(layer.getCircleBlur().getFunction());
+        assertEquals(CompositeFunction.class, layer.getCircleBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleBlur().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getCircleBlur().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleBlur().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -569,12 +689,17 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacityTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setCircleOpacityTransition(options);
-    assertEquals(layer.getCircleOpacityTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setCircleOpacityTransition(options);
+        assertEquals(layer.getCircleOpacityTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -582,11 +707,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleOpacity(0.3f));
-    assertEquals((Float) layer.getCircleOpacity().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleOpacity(0.3f));
+        assertEquals((Float) layer.getCircleOpacity().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -594,26 +724,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleOpacity(
-        zoom(
-          exponential(
-            stop(2, circleOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleOpacity());
-    assertNotNull(layer.getCircleOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getCircleOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getCircleOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getCircleOpacity().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleOpacity(
+            zoom(
+              exponential(
+                stop(2, circleOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleOpacity());
+        assertNotNull(layer.getCircleOpacity().getFunction());
+        assertEquals(CameraFunction.class, layer.getCircleOpacity().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getCircleOpacity().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getCircleOpacity().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -621,19 +756,24 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleOpacity());
-    assertNotNull(layer.getCircleOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleOpacity().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleOpacity());
+        assertNotNull(layer.getCircleOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleOpacity().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -641,26 +781,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleOpacity(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, circleOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleOpacity());
-    assertNotNull(layer.getCircleOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleOpacity(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, circleOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleOpacity());
+        assertNotNull(layer.getCircleOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -668,29 +813,35 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleOpacity(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, circleOpacity(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleOpacity(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, circleOpacity(0.3f))
+              )
+            ).withDefaultValue(circleOpacity(0.3f))
           )
-        ).withDefaultValue(circleOpacity(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleOpacity());
-    assertNotNull(layer.getCircleOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleOpacity().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getCircleOpacity().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getCircleOpacity().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getCircleOpacity().getFunction()).getDefaultValue().getValue());
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleOpacity());
+        assertNotNull(layer.getCircleOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleOpacity().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getCircleOpacity().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getCircleOpacity().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getCircleOpacity().getFunction()).getDefaultValue().getValue());
+      }
+    });
+
   }
 
   @Test
@@ -698,34 +849,39 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleOpacity(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, circleOpacity(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(circleOpacity(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleOpacity());
-    assertNotNull(layer.getCircleOpacity().getFunction());
-    assertEquals(CompositeFunction.class, layer.getCircleOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getCircleOpacity().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleOpacity().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleOpacity(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, circleOpacity(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(circleOpacity(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleOpacity());
+        assertNotNull(layer.getCircleOpacity().getFunction());
+        assertEquals(CompositeFunction.class, layer.getCircleOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getCircleOpacity().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleOpacity().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -733,12 +889,17 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translateTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setCircleTranslateTransition(options);
-    assertEquals(layer.getCircleTranslateTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setCircleTranslateTransition(options);
+        assertEquals(layer.getCircleTranslateTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -746,11 +907,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translate");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleTranslate(new Float[]{0f,0f}));
-    assertEquals((Float[]) layer.getCircleTranslate().getValue(), (Float[]) new Float[]{0f,0f});
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleTranslate(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getCircleTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
+    });
   }
 
   @Test
@@ -758,26 +924,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleTranslate(
-        zoom(
-          exponential(
-            stop(2, circleTranslate(new Float[]{0f,0f}))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleTranslate());
-    assertNotNull(layer.getCircleTranslate().getFunction());
-    assertEquals(CameraFunction.class, layer.getCircleTranslate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getCircleTranslate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getCircleTranslate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getCircleTranslate().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleTranslate(
+            zoom(
+              exponential(
+                stop(2, circleTranslate(new Float[] {0f, 0f}))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleTranslate());
+        assertNotNull(layer.getCircleTranslate().getFunction());
+        assertEquals(CameraFunction.class, layer.getCircleTranslate().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getCircleTranslate().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getCircleTranslate().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getCircleTranslate().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -785,11 +956,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translate-anchor");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleTranslateAnchor(CIRCLE_TRANSLATE_ANCHOR_MAP));
-    assertEquals((String) layer.getCircleTranslateAnchor().getValue(), (String) CIRCLE_TRANSLATE_ANCHOR_MAP);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleTranslateAnchor(CIRCLE_TRANSLATE_ANCHOR_MAP));
+        assertEquals((String) layer.getCircleTranslateAnchor().getValue(), (String) CIRCLE_TRANSLATE_ANCHOR_MAP);
+      }
+    });
   }
 
   @Test
@@ -797,25 +973,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translate-anchor");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleTranslateAnchor(
-        zoom(
-          interval(
-            stop(2, circleTranslateAnchor(CIRCLE_TRANSLATE_ANCHOR_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleTranslateAnchor(
+            zoom(
+              interval(
+                stop(2, circleTranslateAnchor(CIRCLE_TRANSLATE_ANCHOR_MAP))
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleTranslateAnchor());
-    assertNotNull(layer.getCircleTranslateAnchor().getFunction());
-    assertEquals(CameraFunction.class, layer.getCircleTranslateAnchor().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getCircleTranslateAnchor().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getCircleTranslateAnchor().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleTranslateAnchor());
+        assertNotNull(layer.getCircleTranslateAnchor().getFunction());
+        assertEquals(CameraFunction.class, layer.getCircleTranslateAnchor().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getCircleTranslateAnchor().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getCircleTranslateAnchor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -823,11 +1004,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-pitch-scale");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circlePitchScale(CIRCLE_PITCH_SCALE_MAP));
-    assertEquals((String) layer.getCirclePitchScale().getValue(), (String) CIRCLE_PITCH_SCALE_MAP);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circlePitchScale(CIRCLE_PITCH_SCALE_MAP));
+        assertEquals((String) layer.getCirclePitchScale().getValue(), (String) CIRCLE_PITCH_SCALE_MAP);
+      }
+    });
   }
 
   @Test
@@ -835,25 +1021,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-pitch-scale");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circlePitchScale(
-        zoom(
-          interval(
-            stop(2, circlePitchScale(CIRCLE_PITCH_SCALE_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circlePitchScale(
+            zoom(
+              interval(
+                stop(2, circlePitchScale(CIRCLE_PITCH_SCALE_MAP))
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCirclePitchScale());
-    assertNotNull(layer.getCirclePitchScale().getFunction());
-    assertEquals(CameraFunction.class, layer.getCirclePitchScale().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getCirclePitchScale().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getCirclePitchScale().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getCirclePitchScale());
+        assertNotNull(layer.getCirclePitchScale().getFunction());
+        assertEquals(CameraFunction.class, layer.getCirclePitchScale().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getCirclePitchScale().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getCirclePitchScale().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -861,12 +1052,17 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-widthTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setCircleStrokeWidthTransition(options);
-    assertEquals(layer.getCircleStrokeWidthTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setCircleStrokeWidthTransition(options);
+        assertEquals(layer.getCircleStrokeWidthTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -874,11 +1070,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleStrokeWidth(0.3f));
-    assertEquals((Float) layer.getCircleStrokeWidth().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleStrokeWidth(0.3f));
+        assertEquals((Float) layer.getCircleStrokeWidth().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -886,26 +1087,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeWidth(
-        zoom(
-          exponential(
-            stop(2, circleStrokeWidth(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeWidth());
-    assertNotNull(layer.getCircleStrokeWidth().getFunction());
-    assertEquals(CameraFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getCircleStrokeWidth().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getCircleStrokeWidth().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeWidth(
+            zoom(
+              exponential(
+                stop(2, circleStrokeWidth(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeWidth());
+        assertNotNull(layer.getCircleStrokeWidth().getFunction());
+        assertEquals(CameraFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getCircleStrokeWidth().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getCircleStrokeWidth().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -913,19 +1119,24 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeWidth(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeWidth());
-    assertNotNull(layer.getCircleStrokeWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeWidth(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeWidth());
+        assertNotNull(layer.getCircleStrokeWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -933,26 +1144,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeWidth(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, circleStrokeWidth(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeWidth());
-    assertNotNull(layer.getCircleStrokeWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeWidth(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, circleStrokeWidth(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeWidth());
+        assertNotNull(layer.getCircleStrokeWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -960,29 +1176,35 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeWidth(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, circleStrokeWidth(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeWidth(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, circleStrokeWidth(0.3f))
+              )
+            ).withDefaultValue(circleStrokeWidth(0.3f))
           )
-        ).withDefaultValue(circleStrokeWidth(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeWidth());
-    assertNotNull(layer.getCircleStrokeWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getDefaultValue().getValue());
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeWidth());
+        assertNotNull(layer.getCircleStrokeWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getCircleStrokeWidth().getFunction()).getDefaultValue().getValue());
+      }
+    });
+
   }
 
   @Test
@@ -990,34 +1212,39 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeWidth(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, circleStrokeWidth(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(circleStrokeWidth(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeWidth());
-    assertNotNull(layer.getCircleStrokeWidth().getFunction());
-    assertEquals(CompositeFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleStrokeWidth().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getCircleStrokeWidth().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleStrokeWidth().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeWidth(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, circleStrokeWidth(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(circleStrokeWidth(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeWidth());
+        assertNotNull(layer.getCircleStrokeWidth().getFunction());
+        assertEquals(CompositeFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleStrokeWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getCircleStrokeWidth().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleStrokeWidth().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -1025,12 +1252,17 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-colorTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setCircleStrokeColorTransition(options);
-    assertEquals(layer.getCircleStrokeColorTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setCircleStrokeColorTransition(options);
+        assertEquals(layer.getCircleStrokeColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -1038,11 +1270,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleStrokeColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getCircleStrokeColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleStrokeColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getCircleStrokeColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -1050,26 +1287,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeColor(
-        zoom(
-          exponential(
-            stop(2, circleStrokeColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeColor());
-    assertNotNull(layer.getCircleStrokeColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getCircleStrokeColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getCircleStrokeColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getCircleStrokeColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getCircleStrokeColor().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeColor(
+            zoom(
+              exponential(
+                stop(2, circleStrokeColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeColor());
+        assertNotNull(layer.getCircleStrokeColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getCircleStrokeColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getCircleStrokeColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getCircleStrokeColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getCircleStrokeColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1077,19 +1319,24 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeColor());
-    assertNotNull(layer.getCircleStrokeColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleStrokeColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getCircleStrokeColor().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeColor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeColor());
+        assertNotNull(layer.getCircleStrokeColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleStrokeColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeColor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getCircleStrokeColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1097,26 +1344,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, circleStrokeColor(Color.RED))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeColor());
-    assertNotNull(layer.getCircleStrokeColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleStrokeColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleStrokeColor().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeColor(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(Color.RED, circleStrokeColor(Color.RED))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeColor());
+        assertNotNull(layer.getCircleStrokeColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleStrokeColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeColor().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleStrokeColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1124,29 +1376,35 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", circleStrokeColor(Color.RED))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeColor(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop("valueA", circleStrokeColor(Color.RED))
+              )
+            ).withDefaultValue(circleStrokeColor(Color.GREEN))
           )
-        ).withDefaultValue(circleStrokeColor(Color.GREEN))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeColor());
-    assertNotNull(layer.getCircleStrokeColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleStrokeColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getCircleStrokeColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getCircleStrokeColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getCircleStrokeColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getCircleStrokeColor().getFunction()).getDefaultValue().getColorInt());
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeColor());
+        assertNotNull(layer.getCircleStrokeColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleStrokeColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeColor().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getCircleStrokeColor().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getCircleStrokeColor().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getCircleStrokeColor().getFunction()).getDefaultValue().getValue());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getCircleStrokeColor().getFunction()).getDefaultValue().getColorInt());
+      }
+    });
+
   }
 
   @Test
@@ -1154,11 +1412,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleStrokeColor(Color.RED));
-    assertEquals(layer.getCircleStrokeColorAsInt(), Color.RED);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleStrokeColor(Color.RED));
+        assertEquals(layer.getCircleStrokeColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -1166,12 +1429,17 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacityTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setCircleStrokeOpacityTransition(options);
-    assertEquals(layer.getCircleStrokeOpacityTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setCircleStrokeOpacityTransition(options);
+        assertEquals(layer.getCircleStrokeOpacityTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -1179,11 +1447,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(circleStrokeOpacity(0.3f));
-    assertEquals((Float) layer.getCircleStrokeOpacity().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circleStrokeOpacity(0.3f));
+        assertEquals((Float) layer.getCircleStrokeOpacity().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -1191,26 +1464,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeOpacity(
-        zoom(
-          exponential(
-            stop(2, circleStrokeOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeOpacity());
-    assertNotNull(layer.getCircleStrokeOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getCircleStrokeOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getCircleStrokeOpacity().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeOpacity(
+            zoom(
+              exponential(
+                stop(2, circleStrokeOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeOpacity());
+        assertNotNull(layer.getCircleStrokeOpacity().getFunction());
+        assertEquals(CameraFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getCircleStrokeOpacity().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getCircleStrokeOpacity().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1218,19 +1496,24 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeOpacity());
-    assertNotNull(layer.getCircleStrokeOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeOpacity());
+        assertNotNull(layer.getCircleStrokeOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1238,26 +1521,31 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeOpacity(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, circleStrokeOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeOpacity());
-    assertNotNull(layer.getCircleStrokeOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeOpacity(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, circleStrokeOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeOpacity());
+        assertNotNull(layer.getCircleStrokeOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1265,29 +1553,35 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeOpacity(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, circleStrokeOpacity(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeOpacity(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, circleStrokeOpacity(0.3f))
+              )
+            ).withDefaultValue(circleStrokeOpacity(0.3f))
           )
-        ).withDefaultValue(circleStrokeOpacity(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeOpacity());
-    assertNotNull(layer.getCircleStrokeOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getDefaultValue().getValue());
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeOpacity());
+        assertNotNull(layer.getCircleStrokeOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getCircleStrokeOpacity().getFunction()).getDefaultValue().getValue());
+      }
+    });
+
   }
 
   @Test
@@ -1295,34 +1589,39 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      circleStrokeOpacity(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, circleStrokeOpacity(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(circleStrokeOpacity(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getCircleStrokeOpacity());
-    assertNotNull(layer.getCircleStrokeOpacity().getFunction());
-    assertEquals(CompositeFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleStrokeOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getCircleStrokeOpacity().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleStrokeOpacity().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circleStrokeOpacity(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, circleStrokeOpacity(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(circleStrokeOpacity(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getCircleStrokeOpacity());
+        assertNotNull(layer.getCircleStrokeOpacity().getFunction());
+        assertEquals(CompositeFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleStrokeOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getCircleStrokeOpacity().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleStrokeOpacity().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
index fec9a6c119..66c6093537 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
@@ -3,9 +3,9 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
+
 import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -19,20 +19,16 @@ import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
 import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static com.mapbox.mapboxsdk.style.functions.Function.*;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
@@ -53,15 +49,21 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private void setupLayer(){
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new FillExtrusionLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  private void setupLayer() {
+    Timber.i("Retrieving layer");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
+          Timber.i("Adding layer");
+          layer = new FillExtrusionLayer("my-layer", "composite");
+          layer.setSourceLayer("composite");
+          mapboxMap.addLayer(layer);
+          // Layer reference is now stale, get new reference
+          layer = mapboxMap.getLayerAs("my-layer");
+        }
+      }
+    });
   }
 
   @Test
@@ -69,14 +71,19 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Get initial
-    assertEquals(layer.getVisibility().getValue(), VISIBLE);
+        // Get initial
+        assertEquals(layer.getVisibility().getValue(), VISIBLE);
 
-    // Set
-    layer.setProperties(visibility(NONE));
-    assertEquals(layer.getVisibility().getValue(), NONE);
+        // Set
+        layer.setProperties(visibility(NONE));
+        assertEquals(layer.getVisibility().getValue(), NONE);
+      }
+    });
   }
 
   @Test
@@ -84,15 +91,20 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Get initial
-    assertEquals(layer.getSourceLayer(), "composite");
+        // Get initial
+        assertEquals(layer.getSourceLayer(), "composite");
 
-    // Set
-    final String sourceLayer = "test";
-    layer.setSourceLayer(sourceLayer);
-    assertEquals(layer.getSourceLayer(), sourceLayer);
+        // Set
+        final String sourceLayer = "test";
+        layer.setSourceLayer(sourceLayer);
+        assertEquals(layer.getSourceLayer(), sourceLayer);
+      }
+    });
   }
 
   @Test
@@ -100,12 +112,17 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacityTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionOpacityTransition(options);
-    assertEquals(layer.getFillExtrusionOpacityTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillExtrusionOpacityTransition(options);
+        assertEquals(layer.getFillExtrusionOpacityTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -113,11 +130,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacity");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionOpacity(0.3f));
-    assertEquals((Float) layer.getFillExtrusionOpacity().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(fillExtrusionOpacity(0.3f));
+        assertEquals((Float) layer.getFillExtrusionOpacity().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -125,26 +147,31 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionOpacity(
-        zoom(
-          exponential(
-            stop(2, fillExtrusionOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionOpacity(
+            zoom(
+              exponential(
+                stop(2, fillExtrusionOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionOpacity());
-    assertNotNull(layer.getFillExtrusionOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionOpacity().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillExtrusionOpacity());
+        assertNotNull(layer.getFillExtrusionOpacity().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillExtrusionOpacity().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getFillExtrusionOpacity().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionOpacity().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getFillExtrusionOpacity().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -152,12 +179,17 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-colorTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionColorTransition(options);
-    assertEquals(layer.getFillExtrusionColorTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillExtrusionColorTransition(options);
+        assertEquals(layer.getFillExtrusionColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -165,11 +197,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getFillExtrusionColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+        // Set and Get
+        layer.setProperties(fillExtrusionColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getFillExtrusionColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -177,26 +214,31 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionColor(
-        zoom(
-          exponential(
-            stop(2, fillExtrusionColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionColor(
+            zoom(
+              exponential(
+                stop(2, fillExtrusionColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionColor());
-    assertNotNull(layer.getFillExtrusionColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionColor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillExtrusionColor());
+        assertNotNull(layer.getFillExtrusionColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getFillExtrusionColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -204,19 +246,24 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      fillExtrusionColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+        // Set
+        layer.setProperties(
+          fillExtrusionColor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionColor());
-    assertNotNull(layer.getFillExtrusionColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillExtrusionColor());
+        assertNotNull(layer.getFillExtrusionColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -224,26 +271,31 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, fillExtrusionColor(Color.RED))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionColor(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(Color.RED, fillExtrusionColor(Color.RED))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionColor());
-    assertNotNull(layer.getFillExtrusionColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillExtrusionColor());
+        assertNotNull(layer.getFillExtrusionColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -251,29 +303,35 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", fillExtrusionColor(Color.RED))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionColor(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop("valueA", fillExtrusionColor(Color.RED))
+              )
+            ).withDefaultValue(fillExtrusionColor(Color.GREEN))
           )
-        ).withDefaultValue(fillExtrusionColor(Color.GREEN))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getFillExtrusionColor());
+        assertNotNull(layer.getFillExtrusionColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue().getValue());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue().getColorInt());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionColor());
-    assertNotNull(layer.getFillExtrusionColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getFillExtrusionColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getFillExtrusionColor().getFunction()).getDefaultValue().getColorInt());
   }
 
   @Test
@@ -281,11 +339,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionColor(Color.RED));
-    assertEquals(layer.getFillExtrusionColorAsInt(), Color.RED);
+        // Set and Get
+        layer.setProperties(fillExtrusionColor(Color.RED));
+        assertEquals(layer.getFillExtrusionColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -293,12 +356,17 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translateTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionTranslateTransition(options);
-    assertEquals(layer.getFillExtrusionTranslateTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillExtrusionTranslateTransition(options);
+        assertEquals(layer.getFillExtrusionTranslateTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -306,11 +374,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionTranslate(new Float[]{0f,0f}));
-    assertEquals((Float[]) layer.getFillExtrusionTranslate().getValue(), (Float[]) new Float[]{0f,0f});
+        // Set and Get
+        layer.setProperties(fillExtrusionTranslate(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getFillExtrusionTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
+    });
   }
 
   @Test
@@ -318,26 +391,31 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionTranslate(
-        zoom(
-          exponential(
-            stop(2, fillExtrusionTranslate(new Float[]{0f,0f}))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionTranslate(
+            zoom(
+              exponential(
+                stop(2, fillExtrusionTranslate(new Float[] {0f, 0f}))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionTranslate());
-    assertNotNull(layer.getFillExtrusionTranslate().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionTranslate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionTranslate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionTranslate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionTranslate().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillExtrusionTranslate());
+        assertNotNull(layer.getFillExtrusionTranslate().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillExtrusionTranslate().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getFillExtrusionTranslate().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionTranslate().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getFillExtrusionTranslate().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -345,11 +423,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate-anchor");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionTranslateAnchor(FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP));
-    assertEquals((String) layer.getFillExtrusionTranslateAnchor().getValue(), (String) FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP);
+        // Set and Get
+        layer.setProperties(fillExtrusionTranslateAnchor(FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP));
+        assertEquals((String) layer.getFillExtrusionTranslateAnchor().getValue(), (String) FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP);
+      }
+    });
   }
 
   @Test
@@ -357,25 +440,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate-anchor");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionTranslateAnchor(
-        zoom(
-          interval(
-            stop(2, fillExtrusionTranslateAnchor(FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionTranslateAnchor(
+            zoom(
+              interval(
+                stop(2, fillExtrusionTranslateAnchor(FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionTranslateAnchor());
-    assertNotNull(layer.getFillExtrusionTranslateAnchor().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionTranslateAnchor().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getFillExtrusionTranslateAnchor().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getFillExtrusionTranslateAnchor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillExtrusionTranslateAnchor());
+        assertNotNull(layer.getFillExtrusionTranslateAnchor().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillExtrusionTranslateAnchor().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getFillExtrusionTranslateAnchor().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getFillExtrusionTranslateAnchor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -383,12 +471,17 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-patternTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionPatternTransition(options);
-    assertEquals(layer.getFillExtrusionPatternTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillExtrusionPatternTransition(options);
+        assertEquals(layer.getFillExtrusionPatternTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -396,11 +489,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-pattern");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionPattern("pedestrian-polygon"));
-    assertEquals((String) layer.getFillExtrusionPattern().getValue(), (String) "pedestrian-polygon");
+        // Set and Get
+        layer.setProperties(fillExtrusionPattern("pedestrian-polygon"));
+        assertEquals((String) layer.getFillExtrusionPattern().getValue(), (String) "pedestrian-polygon");
+      }
+    });
   }
 
   @Test
@@ -408,25 +506,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-pattern");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionPattern(
-        zoom(
-          interval(
-            stop(2, fillExtrusionPattern("pedestrian-polygon"))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionPattern(
+            zoom(
+              interval(
+                stop(2, fillExtrusionPattern("pedestrian-polygon"))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionPattern());
-    assertNotNull(layer.getFillExtrusionPattern().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionPattern().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getFillExtrusionPattern().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getFillExtrusionPattern().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillExtrusionPattern());
+        assertNotNull(layer.getFillExtrusionPattern().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillExtrusionPattern().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getFillExtrusionPattern().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getFillExtrusionPattern().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -434,12 +537,17 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-heightTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionHeightTransition(options);
-    assertEquals(layer.getFillExtrusionHeightTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillExtrusionHeightTransition(options);
+        assertEquals(layer.getFillExtrusionHeightTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -447,11 +555,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionHeight(0.3f));
-    assertEquals((Float) layer.getFillExtrusionHeight().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(fillExtrusionHeight(0.3f));
+        assertEquals((Float) layer.getFillExtrusionHeight().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -459,26 +572,31 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionHeight(
-        zoom(
-          exponential(
-            stop(2, fillExtrusionHeight(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionHeight(
+            zoom(
+              exponential(
+                stop(2, fillExtrusionHeight(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionHeight());
-    assertNotNull(layer.getFillExtrusionHeight().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillExtrusionHeight());
+        assertNotNull(layer.getFillExtrusionHeight().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -486,19 +604,24 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      fillExtrusionHeight(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          fillExtrusionHeight(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionHeight());
-    assertNotNull(layer.getFillExtrusionHeight().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillExtrusionHeight());
+        assertNotNull(layer.getFillExtrusionHeight().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -506,26 +629,31 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionHeight(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, fillExtrusionHeight(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionHeight(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, fillExtrusionHeight(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionHeight());
-    assertNotNull(layer.getFillExtrusionHeight().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillExtrusionHeight());
+        assertNotNull(layer.getFillExtrusionHeight().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -533,29 +661,35 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionHeight(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, fillExtrusionHeight(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionHeight(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, fillExtrusionHeight(0.3f))
+              )
+            ).withDefaultValue(fillExtrusionHeight(0.3f))
           )
-        ).withDefaultValue(fillExtrusionHeight(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getFillExtrusionHeight());
+        assertNotNull(layer.getFillExtrusionHeight().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionHeight());
-    assertNotNull(layer.getFillExtrusionHeight().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getFillExtrusionHeight().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -563,34 +697,39 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionHeight(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, fillExtrusionHeight(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(fillExtrusionHeight(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getFillExtrusionHeight());
-    assertNotNull(layer.getFillExtrusionHeight().getFunction());
-    assertEquals(CompositeFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillExtrusionHeight().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionHeight(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, fillExtrusionHeight(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(fillExtrusionHeight(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getFillExtrusionHeight());
+        assertNotNull(layer.getFillExtrusionHeight().getFunction());
+        assertEquals(CompositeFunction.class, layer.getFillExtrusionHeight().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillExtrusionHeight().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getFillExtrusionHeight().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getFillExtrusionHeight().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillExtrusionHeight().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -598,12 +737,17 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-baseTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillExtrusionBaseTransition(options);
-    assertEquals(layer.getFillExtrusionBaseTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillExtrusionBaseTransition(options);
+        assertEquals(layer.getFillExtrusionBaseTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -611,11 +755,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillExtrusionBase(0.3f));
-    assertEquals((Float) layer.getFillExtrusionBase().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(fillExtrusionBase(0.3f));
+        assertEquals((Float) layer.getFillExtrusionBase().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -623,26 +772,31 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionBase(
-        zoom(
-          exponential(
-            stop(2, fillExtrusionBase(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionBase(
+            zoom(
+              exponential(
+                stop(2, fillExtrusionBase(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionBase());
-    assertNotNull(layer.getFillExtrusionBase().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillExtrusionBase());
+        assertNotNull(layer.getFillExtrusionBase().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -650,19 +804,24 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      fillExtrusionBase(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          fillExtrusionBase(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionBase());
-    assertNotNull(layer.getFillExtrusionBase().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillExtrusionBase());
+        assertNotNull(layer.getFillExtrusionBase().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -670,26 +829,31 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionBase(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, fillExtrusionBase(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionBase(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, fillExtrusionBase(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionBase());
-    assertNotNull(layer.getFillExtrusionBase().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillExtrusionBase());
+        assertNotNull(layer.getFillExtrusionBase().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -697,29 +861,35 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionBase(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, fillExtrusionBase(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionBase(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, fillExtrusionBase(0.3f))
+              )
+            ).withDefaultValue(fillExtrusionBase(0.3f))
           )
-        ).withDefaultValue(fillExtrusionBase(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getFillExtrusionBase());
+        assertNotNull(layer.getFillExtrusionBase().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getFillExtrusionBase());
-    assertNotNull(layer.getFillExtrusionBase().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getFillExtrusionBase().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -727,34 +897,39 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillExtrusionBase(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, fillExtrusionBase(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(fillExtrusionBase(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getFillExtrusionBase());
-    assertNotNull(layer.getFillExtrusionBase().getFunction());
-    assertEquals(CompositeFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillExtrusionBase().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillExtrusionBase(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, fillExtrusionBase(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(fillExtrusionBase(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getFillExtrusionBase());
+        assertNotNull(layer.getFillExtrusionBase().getFunction());
+        assertEquals(CompositeFunction.class, layer.getFillExtrusionBase().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillExtrusionBase().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getFillExtrusionBase().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getFillExtrusionBase().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillExtrusionBase().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
index b6b6578839..939bcb6892 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
@@ -3,9 +3,9 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
+
 import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -19,20 +19,16 @@ import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
 import com.mapbox.mapboxsdk.style.layers.FillLayer;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static com.mapbox.mapboxsdk.style.functions.Function.*;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
@@ -53,15 +49,21 @@ public class FillLayerTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private void setupLayer(){
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new FillLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  private void setupLayer() {
+    Timber.i("Retrieving layer");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
+          Timber.i("Adding layer");
+          layer = new FillLayer("my-layer", "composite");
+          layer.setSourceLayer("composite");
+          mapboxMap.addLayer(layer);
+          // Layer reference is now stale, get new reference
+          layer = mapboxMap.getLayerAs("my-layer");
+        }
+      }
+    });
   }
 
   @Test
@@ -69,14 +71,19 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Get initial
-    assertEquals(layer.getVisibility().getValue(), VISIBLE);
+        // Get initial
+        assertEquals(layer.getVisibility().getValue(), VISIBLE);
 
-    // Set
-    layer.setProperties(visibility(NONE));
-    assertEquals(layer.getVisibility().getValue(), NONE);
+        // Set
+        layer.setProperties(visibility(NONE));
+        assertEquals(layer.getVisibility().getValue(), NONE);
+      }
+    });
   }
 
   @Test
@@ -84,15 +91,20 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Get initial
-    assertEquals(layer.getSourceLayer(), "composite");
+        // Get initial
+        assertEquals(layer.getSourceLayer(), "composite");
 
-    // Set
-    final String sourceLayer = "test";
-    layer.setSourceLayer(sourceLayer);
-    assertEquals(layer.getSourceLayer(), sourceLayer);
+        // Set
+        final String sourceLayer = "test";
+        layer.setSourceLayer(sourceLayer);
+        assertEquals(layer.getSourceLayer(), sourceLayer);
+      }
+    });
   }
 
   @Test
@@ -100,11 +112,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-antialias");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillAntialias(true));
-    assertEquals((Boolean) layer.getFillAntialias().getValue(), (Boolean) true);
+        // Set and Get
+        layer.setProperties(fillAntialias(true));
+        assertEquals((Boolean) layer.getFillAntialias().getValue(), (Boolean) true);
+      }
+    });
   }
 
   @Test
@@ -112,25 +129,30 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-antialias");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillAntialias(
-        zoom(
-          interval(
-            stop(2, fillAntialias(true))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillAntialias(
+            zoom(
+              interval(
+                stop(2, fillAntialias(true))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getFillAntialias());
-    assertNotNull(layer.getFillAntialias().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillAntialias().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getFillAntialias().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getFillAntialias().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillAntialias());
+        assertNotNull(layer.getFillAntialias().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillAntialias().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getFillAntialias().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getFillAntialias().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -138,12 +160,17 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacityTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillOpacityTransition(options);
-    assertEquals(layer.getFillOpacityTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillOpacityTransition(options);
+        assertEquals(layer.getFillOpacityTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -151,11 +178,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillOpacity(0.3f));
-    assertEquals((Float) layer.getFillOpacity().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(fillOpacity(0.3f));
+        assertEquals((Float) layer.getFillOpacity().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -163,26 +195,31 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillOpacity(
-        zoom(
-          exponential(
-            stop(2, fillOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillOpacity(
+            zoom(
+              exponential(
+                stop(2, fillOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillOpacity());
-    assertNotNull(layer.getFillOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillOpacity().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillOpacity());
+        assertNotNull(layer.getFillOpacity().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillOpacity().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getFillOpacity().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getFillOpacity().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getFillOpacity().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -190,19 +227,24 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      fillOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          fillOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getFillOpacity());
-    assertNotNull(layer.getFillOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOpacity().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getFillOpacity().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillOpacity());
+        assertNotNull(layer.getFillOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOpacity().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getFillOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -210,26 +252,31 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillOpacity(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, fillOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillOpacity(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, fillOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillOpacity());
-    assertNotNull(layer.getFillOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillOpacity().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillOpacity());
+        assertNotNull(layer.getFillOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getFillOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -237,29 +284,35 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillOpacity(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, fillOpacity(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillOpacity(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, fillOpacity(0.3f))
+              )
+            ).withDefaultValue(fillOpacity(0.3f))
           )
-        ).withDefaultValue(fillOpacity(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getFillOpacity());
+        assertNotNull(layer.getFillOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOpacity().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getFillOpacity().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getFillOpacity().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getFillOpacity().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getFillOpacity().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getFillOpacity());
-    assertNotNull(layer.getFillOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOpacity().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getFillOpacity().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getFillOpacity().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getFillOpacity().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getFillOpacity().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -267,34 +320,39 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillOpacity(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, fillOpacity(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(fillOpacity(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getFillOpacity());
-    assertNotNull(layer.getFillOpacity().getFunction());
-    assertEquals(CompositeFunction.class, layer.getFillOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillOpacity().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getFillOpacity().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillOpacity().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillOpacity(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, fillOpacity(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(fillOpacity(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getFillOpacity());
+        assertNotNull(layer.getFillOpacity().getFunction());
+        assertEquals(CompositeFunction.class, layer.getFillOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getFillOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getFillOpacity().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getFillOpacity().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getFillOpacity().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -302,12 +360,17 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-colorTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillColorTransition(options);
-    assertEquals(layer.getFillColorTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillColorTransition(options);
+        assertEquals(layer.getFillColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -315,11 +378,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getFillColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+        // Set and Get
+        layer.setProperties(fillColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getFillColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -327,26 +395,31 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillColor(
-        zoom(
-          exponential(
-            stop(2, fillColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillColor(
+            zoom(
+              exponential(
+                stop(2, fillColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillColor());
-    assertNotNull(layer.getFillColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillColor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillColor());
+        assertNotNull(layer.getFillColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getFillColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getFillColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getFillColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -354,19 +427,24 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      fillColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+        // Set
+        layer.setProperties(
+          fillColor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getFillColor());
-    assertNotNull(layer.getFillColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getFillColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillColor());
+        assertNotNull(layer.getFillColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillColor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getFillColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -374,26 +452,31 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, fillColor(Color.RED))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillColor(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(Color.RED, fillColor(Color.RED))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillColor());
-    assertNotNull(layer.getFillColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillColor());
+        assertNotNull(layer.getFillColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillColor().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getFillColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -401,29 +484,35 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", fillColor(Color.RED))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillColor(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop("valueA", fillColor(Color.RED))
+              )
+            ).withDefaultValue(fillColor(Color.GREEN))
           )
-        ).withDefaultValue(fillColor(Color.GREEN))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getFillColor());
+        assertNotNull(layer.getFillColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillColor().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getFillColor().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getFillColor().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getFillColor().getFunction()).getDefaultValue().getValue());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getFillColor().getFunction()).getDefaultValue().getColorInt());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getFillColor());
-    assertNotNull(layer.getFillColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getFillColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getFillColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getFillColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getFillColor().getFunction()).getDefaultValue().getColorInt());
   }
 
   @Test
@@ -431,11 +520,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillColor(Color.RED));
-    assertEquals(layer.getFillColorAsInt(), Color.RED);
+        // Set and Get
+        layer.setProperties(fillColor(Color.RED));
+        assertEquals(layer.getFillColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -443,12 +537,17 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-colorTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillOutlineColorTransition(options);
-    assertEquals(layer.getFillOutlineColorTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillOutlineColorTransition(options);
+        assertEquals(layer.getFillOutlineColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -456,11 +555,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillOutlineColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getFillOutlineColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+        // Set and Get
+        layer.setProperties(fillOutlineColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getFillOutlineColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -468,26 +572,31 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillOutlineColor(
-        zoom(
-          exponential(
-            stop(2, fillOutlineColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillOutlineColor(
+            zoom(
+              exponential(
+                stop(2, fillOutlineColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillOutlineColor());
-    assertNotNull(layer.getFillOutlineColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillOutlineColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillOutlineColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillOutlineColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillOutlineColor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillOutlineColor());
+        assertNotNull(layer.getFillOutlineColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillOutlineColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getFillOutlineColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getFillOutlineColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getFillOutlineColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -495,19 +604,24 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      fillOutlineColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+        // Set
+        layer.setProperties(
+          fillOutlineColor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getFillOutlineColor());
-    assertNotNull(layer.getFillOutlineColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillOutlineColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOutlineColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getFillOutlineColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillOutlineColor());
+        assertNotNull(layer.getFillOutlineColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillOutlineColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOutlineColor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getFillOutlineColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -515,26 +629,31 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillOutlineColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, fillOutlineColor(Color.RED))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillOutlineColor(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(Color.RED, fillOutlineColor(Color.RED))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillOutlineColor());
-    assertNotNull(layer.getFillOutlineColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillOutlineColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOutlineColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getFillOutlineColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getFillOutlineColor());
+        assertNotNull(layer.getFillOutlineColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillOutlineColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOutlineColor().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getFillOutlineColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -542,29 +661,35 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillOutlineColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", fillOutlineColor(Color.RED))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillOutlineColor(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop("valueA", fillOutlineColor(Color.RED))
+              )
+            ).withDefaultValue(fillOutlineColor(Color.GREEN))
           )
-        ).withDefaultValue(fillOutlineColor(Color.GREEN))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getFillOutlineColor());
+        assertNotNull(layer.getFillOutlineColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getFillOutlineColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOutlineColor().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getFillOutlineColor().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getFillOutlineColor().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getFillOutlineColor().getFunction()).getDefaultValue().getValue());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getFillOutlineColor().getFunction()).getDefaultValue().getColorInt());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getFillOutlineColor());
-    assertNotNull(layer.getFillOutlineColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getFillOutlineColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getFillOutlineColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getFillOutlineColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getFillOutlineColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getFillOutlineColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getFillOutlineColor().getFunction()).getDefaultValue().getColorInt());
   }
 
   @Test
@@ -572,11 +697,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillOutlineColor(Color.RED));
-    assertEquals(layer.getFillOutlineColorAsInt(), Color.RED);
+        // Set and Get
+        layer.setProperties(fillOutlineColor(Color.RED));
+        assertEquals(layer.getFillOutlineColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -584,12 +714,17 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-translateTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillTranslateTransition(options);
-    assertEquals(layer.getFillTranslateTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillTranslateTransition(options);
+        assertEquals(layer.getFillTranslateTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -597,11 +732,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-translate");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillTranslate(new Float[]{0f,0f}));
-    assertEquals((Float[]) layer.getFillTranslate().getValue(), (Float[]) new Float[]{0f,0f});
+        // Set and Get
+        layer.setProperties(fillTranslate(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getFillTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
+    });
   }
 
   @Test
@@ -609,26 +749,31 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-translate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillTranslate(
-        zoom(
-          exponential(
-            stop(2, fillTranslate(new Float[]{0f,0f}))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillTranslate(
+            zoom(
+              exponential(
+                stop(2, fillTranslate(new Float[] {0f, 0f}))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getFillTranslate());
-    assertNotNull(layer.getFillTranslate().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillTranslate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getFillTranslate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getFillTranslate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getFillTranslate().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillTranslate());
+        assertNotNull(layer.getFillTranslate().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillTranslate().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getFillTranslate().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getFillTranslate().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getFillTranslate().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -636,11 +781,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-translate-anchor");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillTranslateAnchor(FILL_TRANSLATE_ANCHOR_MAP));
-    assertEquals((String) layer.getFillTranslateAnchor().getValue(), (String) FILL_TRANSLATE_ANCHOR_MAP);
+        // Set and Get
+        layer.setProperties(fillTranslateAnchor(FILL_TRANSLATE_ANCHOR_MAP));
+        assertEquals((String) layer.getFillTranslateAnchor().getValue(), (String) FILL_TRANSLATE_ANCHOR_MAP);
+      }
+    });
   }
 
   @Test
@@ -648,25 +798,30 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-translate-anchor");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillTranslateAnchor(
-        zoom(
-          interval(
-            stop(2, fillTranslateAnchor(FILL_TRANSLATE_ANCHOR_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillTranslateAnchor(
+            zoom(
+              interval(
+                stop(2, fillTranslateAnchor(FILL_TRANSLATE_ANCHOR_MAP))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getFillTranslateAnchor());
-    assertNotNull(layer.getFillTranslateAnchor().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillTranslateAnchor().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getFillTranslateAnchor().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getFillTranslateAnchor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getFillTranslateAnchor());
+        assertNotNull(layer.getFillTranslateAnchor().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillTranslateAnchor().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getFillTranslateAnchor().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getFillTranslateAnchor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -674,12 +829,17 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-patternTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setFillPatternTransition(options);
-    assertEquals(layer.getFillPatternTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setFillPatternTransition(options);
+        assertEquals(layer.getFillPatternTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -687,11 +847,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-pattern");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(fillPattern("pedestrian-polygon"));
-    assertEquals((String) layer.getFillPattern().getValue(), (String) "pedestrian-polygon");
+        // Set and Get
+        layer.setProperties(fillPattern("pedestrian-polygon"));
+        assertEquals((String) layer.getFillPattern().getValue(), (String) "pedestrian-polygon");
+      }
+    });
   }
 
   @Test
@@ -699,25 +864,30 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-pattern");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      fillPattern(
-        zoom(
-          interval(
-            stop(2, fillPattern("pedestrian-polygon"))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          fillPattern(
+            zoom(
+              interval(
+                stop(2, fillPattern("pedestrian-polygon"))
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getFillPattern());
-    assertNotNull(layer.getFillPattern().getFunction());
-    assertEquals(CameraFunction.class, layer.getFillPattern().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getFillPattern().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getFillPattern().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getFillPattern());
+        assertNotNull(layer.getFillPattern().getFunction());
+        assertEquals(CameraFunction.class, layer.getFillPattern().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getFillPattern().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getFillPattern().getFunction().getStops()).size());
+      }
+    });
   }
 
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
index 36833fb4ee..88da6e45be 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
@@ -6,6 +6,7 @@ import android.support.test.espresso.ViewAction;
 import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 
+import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.light.Light;
 import com.mapbox.mapboxsdk.style.functions.Function;
 import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops;
@@ -13,6 +14,7 @@ import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 import com.mapbox.mapboxsdk.style.light.Position;
 import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.style.FillExtrusionStyleTestActivity;
 
@@ -32,6 +34,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionCol
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionHeight;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionOpacity;
 
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 
@@ -43,89 +46,120 @@ public class LightTest extends BaseActivityTest {
   @Test
   public void testAnchor() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("anchor");
-    assertNotNull(light);
-    // Set and Get
-    light.setAnchor(ANCHOR_MAP);
-    assertEquals("Anchor should match", ANCHOR_MAP, light.getAnchor());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        light.setAnchor(ANCHOR_MAP);
+        assertEquals("Anchor should match", ANCHOR_MAP, light.getAnchor());
+      }
+    });
   }
 
   @Test
   public void testPositionTransition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("positionTransitionOptions");
-    assertNotNull(light);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    light.setPositionTransition(options);
-    assertEquals("Transition options should match", options, light.getPositionTransition());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        light.setPositionTransition(options);
+        assertEquals("Transition options should match", options, light.getPositionTransition());
+      }
+    });
   }
 
   @Test
   public void testPosition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("position");
-    assertNotNull(light);
-
-    // Set and Get
-    Position position = new Position(1,2,3);
-    light.setPosition(position);
-    assertEquals("Position should match", position, light.getPosition());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        Position position = new Position(1, 2, 3);
+        light.setPosition(position);
+        assertEquals("Position should match", position, light.getPosition());
+      }
+    });
   }
 
   @Test
   public void testColorTransition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("colorTransitionOptions");
-    assertNotNull(light);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    light.setColorTransition(options);
-    assertEquals("Transition options should match", options, light.getColorTransition());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        light.setColorTransition(options);
+        assertEquals("Transition options should match", options, light.getColorTransition());
+      }
+    });
   }
 
   @Test
   public void testColor() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("color");
-    assertNotNull(light);
-    // Set and Get
-    light.setColor("rgba(0, 0, 0, 1)");
-    assertEquals("Color should match", "rgba(0, 0, 0, 1)".replaceAll("\\s+",""), light.getColor());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        light.setColor("rgba(0, 0, 0, 1)");
+        assertEquals("Color should match", "rgba(0, 0, 0, 1)".replaceAll("\\s+", ""), light.getColor());
+      }
+    });
   }
 
   @Test
   public void testIntensityTransition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("intensityTransitionOptions");
-    assertNotNull(light);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    light.setIntensityTransition(options);
-    assertEquals("Transition options should match", options, light.getIntensityTransition());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        light.setIntensityTransition(options);
+        assertEquals("Transition options should match", options, light.getIntensityTransition());
+      }
+    });
   }
 
   @Test
   public void testIntensity() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("intensity");
-    assertNotNull(light);
-    // Set and Get
-    light.setIntensity(0.3f);
-    assertEquals("Intensity should match", 0.3f, light.getIntensity());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        light.setIntensity(0.3f);
+        assertEquals("Intensity should match", 0.3f, light.getIntensity());
+      }
+    });
   }
 
-  private void setupLayer() {
+  private void setupLight() {
     onView(withId(R.id.mapView)).perform(new ViewAction() {
       @Override
       public Matcher<View> getConstraints() {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java
index 1c23dd366b..595a2e43dc 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java
@@ -3,9 +3,9 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
+
 import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -19,20 +19,16 @@ import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
 import com.mapbox.mapboxsdk.style.layers.LineLayer;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static com.mapbox.mapboxsdk.style.functions.Function.*;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
@@ -53,15 +49,21 @@ public class LineLayerTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private void setupLayer(){
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new LineLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  private void setupLayer() {
+    Timber.i("Retrieving layer");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
+          Timber.i("Adding layer");
+          layer = new LineLayer("my-layer", "composite");
+          layer.setSourceLayer("composite");
+          mapboxMap.addLayer(layer);
+          // Layer reference is now stale, get new reference
+          layer = mapboxMap.getLayerAs("my-layer");
+        }
+      }
+    });
   }
 
   @Test
@@ -69,14 +71,19 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
-
-    // Get initial
-    assertEquals(layer.getVisibility().getValue(), VISIBLE);
-
-    // Set
-    layer.setProperties(visibility(NONE));
-    assertEquals(layer.getVisibility().getValue(), NONE);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Get initial
+        assertEquals(layer.getVisibility().getValue(), VISIBLE);
+
+        // Set
+        layer.setProperties(visibility(NONE));
+        assertEquals(layer.getVisibility().getValue(), NONE);
+      }
+    });
   }
 
   @Test
@@ -84,15 +91,20 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    assertNotNull(layer);
-
-    // Get initial
-    assertEquals(layer.getSourceLayer(), "composite");
-
-    // Set
-    final String sourceLayer = "test";
-    layer.setSourceLayer(sourceLayer);
-    assertEquals(layer.getSourceLayer(), sourceLayer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Get initial
+        assertEquals(layer.getSourceLayer(), "composite");
+
+        // Set
+        final String sourceLayer = "test";
+        layer.setSourceLayer(sourceLayer);
+        assertEquals(layer.getSourceLayer(), sourceLayer);
+      }
+    });
   }
 
   @Test
@@ -100,11 +112,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-cap");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineCap(LINE_CAP_BUTT));
-    assertEquals((String) layer.getLineCap().getValue(), (String) LINE_CAP_BUTT);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineCap(LINE_CAP_BUTT));
+        assertEquals((String) layer.getLineCap().getValue(), (String) LINE_CAP_BUTT);
+      }
+    });
   }
 
   @Test
@@ -112,25 +129,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-cap");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineCap(
-        zoom(
-          interval(
-            stop(2, lineCap(LINE_CAP_BUTT))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineCap(
+            zoom(
+              interval(
+                stop(2, lineCap(LINE_CAP_BUTT))
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineCap());
-    assertNotNull(layer.getLineCap().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineCap().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getLineCap().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getLineCap().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineCap());
+        assertNotNull(layer.getLineCap().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineCap().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getLineCap().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getLineCap().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -138,11 +160,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-join");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineJoin(LINE_JOIN_BEVEL));
-    assertEquals((String) layer.getLineJoin().getValue(), (String) LINE_JOIN_BEVEL);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineJoin(LINE_JOIN_BEVEL));
+        assertEquals((String) layer.getLineJoin().getValue(), (String) LINE_JOIN_BEVEL);
+      }
+    });
   }
 
   @Test
@@ -150,25 +177,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-join");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineJoin(
-        zoom(
-          interval(
-            stop(2, lineJoin(LINE_JOIN_BEVEL))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineJoin(
+            zoom(
+              interval(
+                stop(2, lineJoin(LINE_JOIN_BEVEL))
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineJoin());
-    assertNotNull(layer.getLineJoin().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineJoin().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getLineJoin().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getLineJoin().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineJoin());
+        assertNotNull(layer.getLineJoin().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineJoin().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getLineJoin().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getLineJoin().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -176,11 +208,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-miter-limit");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineMiterLimit(0.3f));
-    assertEquals((Float) layer.getLineMiterLimit().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineMiterLimit(0.3f));
+        assertEquals((Float) layer.getLineMiterLimit().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -188,26 +225,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-miter-limit");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineMiterLimit(
-        zoom(
-          exponential(
-            stop(2, lineMiterLimit(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineMiterLimit());
-    assertNotNull(layer.getLineMiterLimit().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineMiterLimit().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getLineMiterLimit().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getLineMiterLimit().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getLineMiterLimit().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineMiterLimit(
+            zoom(
+              exponential(
+                stop(2, lineMiterLimit(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineMiterLimit());
+        assertNotNull(layer.getLineMiterLimit().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineMiterLimit().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getLineMiterLimit().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getLineMiterLimit().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getLineMiterLimit().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -215,11 +257,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-round-limit");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineRoundLimit(0.3f));
-    assertEquals((Float) layer.getLineRoundLimit().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineRoundLimit(0.3f));
+        assertEquals((Float) layer.getLineRoundLimit().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -227,26 +274,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-round-limit");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineRoundLimit(
-        zoom(
-          exponential(
-            stop(2, lineRoundLimit(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineRoundLimit());
-    assertNotNull(layer.getLineRoundLimit().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineRoundLimit().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getLineRoundLimit().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getLineRoundLimit().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getLineRoundLimit().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineRoundLimit(
+            zoom(
+              exponential(
+                stop(2, lineRoundLimit(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineRoundLimit());
+        assertNotNull(layer.getLineRoundLimit().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineRoundLimit().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getLineRoundLimit().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getLineRoundLimit().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getLineRoundLimit().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -254,12 +306,17 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacityTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setLineOpacityTransition(options);
-    assertEquals(layer.getLineOpacityTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setLineOpacityTransition(options);
+        assertEquals(layer.getLineOpacityTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -267,11 +324,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineOpacity(0.3f));
-    assertEquals((Float) layer.getLineOpacity().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineOpacity(0.3f));
+        assertEquals((Float) layer.getLineOpacity().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -279,26 +341,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineOpacity(
-        zoom(
-          exponential(
-            stop(2, lineOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineOpacity());
-    assertNotNull(layer.getLineOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getLineOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getLineOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getLineOpacity().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineOpacity(
+            zoom(
+              exponential(
+                stop(2, lineOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineOpacity());
+        assertNotNull(layer.getLineOpacity().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineOpacity().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getLineOpacity().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getLineOpacity().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getLineOpacity().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -306,19 +373,24 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getLineOpacity());
-    assertNotNull(layer.getLineOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOpacity().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getLineOpacity().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getLineOpacity());
+        assertNotNull(layer.getLineOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOpacity().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getLineOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -326,26 +398,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineOpacity(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, lineOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineOpacity());
-    assertNotNull(layer.getLineOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getLineOpacity().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineOpacity(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, lineOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineOpacity());
+        assertNotNull(layer.getLineOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -353,29 +430,35 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineOpacity(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, lineOpacity(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineOpacity(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, lineOpacity(0.3f))
+              )
+            ).withDefaultValue(lineOpacity(0.3f))
           )
-        ).withDefaultValue(lineOpacity(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineOpacity());
-    assertNotNull(layer.getLineOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOpacity().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getLineOpacity().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getLineOpacity().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getLineOpacity().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getLineOpacity().getFunction()).getDefaultValue().getValue());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineOpacity());
+        assertNotNull(layer.getLineOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOpacity().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getLineOpacity().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getLineOpacity().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getLineOpacity().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getLineOpacity().getFunction()).getDefaultValue().getValue());
+      }
+    });
+
   }
 
   @Test
@@ -383,34 +466,39 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineOpacity(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, lineOpacity(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(lineOpacity(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineOpacity());
-    assertNotNull(layer.getLineOpacity().getFunction());
-    assertEquals(CompositeFunction.class, layer.getLineOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getLineOpacity().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getLineOpacity().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineOpacity().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineOpacity(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, lineOpacity(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(lineOpacity(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineOpacity());
+        assertNotNull(layer.getLineOpacity().getFunction());
+        assertEquals(CompositeFunction.class, layer.getLineOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineOpacity().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getLineOpacity().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineOpacity().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -418,12 +506,17 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-colorTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setLineColorTransition(options);
-    assertEquals(layer.getLineColorTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setLineColorTransition(options);
+        assertEquals(layer.getLineColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -431,11 +524,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getLineColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getLineColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -443,26 +541,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineColor(
-        zoom(
-          exponential(
-            stop(2, lineColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineColor());
-    assertNotNull(layer.getLineColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getLineColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getLineColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getLineColor().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineColor(
+            zoom(
+              exponential(
+                stop(2, lineColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineColor());
+        assertNotNull(layer.getLineColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getLineColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getLineColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getLineColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -470,19 +573,24 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getLineColor());
-    assertNotNull(layer.getLineColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getLineColor().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineColor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getLineColor());
+        assertNotNull(layer.getLineColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineColor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getLineColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -490,26 +598,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, lineColor(Color.RED))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineColor());
-    assertNotNull(layer.getLineColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getLineColor().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineColor(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(Color.RED, lineColor(Color.RED))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineColor());
+        assertNotNull(layer.getLineColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineColor().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -517,29 +630,35 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", lineColor(Color.RED))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineColor(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop("valueA", lineColor(Color.RED))
+              )
+            ).withDefaultValue(lineColor(Color.GREEN))
           )
-        ).withDefaultValue(lineColor(Color.GREEN))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineColor());
-    assertNotNull(layer.getLineColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getLineColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getLineColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getLineColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getLineColor().getFunction()).getDefaultValue().getColorInt());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineColor());
+        assertNotNull(layer.getLineColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineColor().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getLineColor().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getLineColor().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getLineColor().getFunction()).getDefaultValue().getValue());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getLineColor().getFunction()).getDefaultValue().getColorInt());
+      }
+    });
+
   }
 
   @Test
@@ -547,11 +666,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineColor(Color.RED));
-    assertEquals(layer.getLineColorAsInt(), Color.RED);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineColor(Color.RED));
+        assertEquals(layer.getLineColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -559,12 +683,17 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-translateTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setLineTranslateTransition(options);
-    assertEquals(layer.getLineTranslateTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setLineTranslateTransition(options);
+        assertEquals(layer.getLineTranslateTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -572,11 +701,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-translate");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineTranslate(new Float[]{0f,0f}));
-    assertEquals((Float[]) layer.getLineTranslate().getValue(), (Float[]) new Float[]{0f,0f});
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineTranslate(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getLineTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
+    });
   }
 
   @Test
@@ -584,26 +718,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-translate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineTranslate(
-        zoom(
-          exponential(
-            stop(2, lineTranslate(new Float[]{0f,0f}))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineTranslate());
-    assertNotNull(layer.getLineTranslate().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineTranslate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getLineTranslate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getLineTranslate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getLineTranslate().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineTranslate(
+            zoom(
+              exponential(
+                stop(2, lineTranslate(new Float[] {0f, 0f}))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineTranslate());
+        assertNotNull(layer.getLineTranslate().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineTranslate().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getLineTranslate().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getLineTranslate().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getLineTranslate().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -611,11 +750,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-translate-anchor");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineTranslateAnchor(LINE_TRANSLATE_ANCHOR_MAP));
-    assertEquals((String) layer.getLineTranslateAnchor().getValue(), (String) LINE_TRANSLATE_ANCHOR_MAP);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineTranslateAnchor(LINE_TRANSLATE_ANCHOR_MAP));
+        assertEquals((String) layer.getLineTranslateAnchor().getValue(), (String) LINE_TRANSLATE_ANCHOR_MAP);
+      }
+    });
   }
 
   @Test
@@ -623,25 +767,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-translate-anchor");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineTranslateAnchor(
-        zoom(
-          interval(
-            stop(2, lineTranslateAnchor(LINE_TRANSLATE_ANCHOR_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineTranslateAnchor(
+            zoom(
+              interval(
+                stop(2, lineTranslateAnchor(LINE_TRANSLATE_ANCHOR_MAP))
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineTranslateAnchor());
-    assertNotNull(layer.getLineTranslateAnchor().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineTranslateAnchor().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getLineTranslateAnchor().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getLineTranslateAnchor().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineTranslateAnchor());
+        assertNotNull(layer.getLineTranslateAnchor().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineTranslateAnchor().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getLineTranslateAnchor().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getLineTranslateAnchor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -649,12 +798,17 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-widthTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setLineWidthTransition(options);
-    assertEquals(layer.getLineWidthTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setLineWidthTransition(options);
+        assertEquals(layer.getLineWidthTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -662,11 +816,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-width");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineWidth(0.3f));
-    assertEquals((Float) layer.getLineWidth().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineWidth(0.3f));
+        assertEquals((Float) layer.getLineWidth().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -674,26 +833,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineWidth(
-        zoom(
-          exponential(
-            stop(2, lineWidth(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineWidth());
-    assertNotNull(layer.getLineWidth().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineWidth().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getLineWidth().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getLineWidth().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getLineWidth().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineWidth(
+            zoom(
+              exponential(
+                stop(2, lineWidth(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineWidth());
+        assertNotNull(layer.getLineWidth().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineWidth().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getLineWidth().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getLineWidth().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getLineWidth().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -701,12 +865,17 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-widthTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setLineGapWidthTransition(options);
-    assertEquals(layer.getLineGapWidthTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setLineGapWidthTransition(options);
+        assertEquals(layer.getLineGapWidthTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -714,11 +883,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineGapWidth(0.3f));
-    assertEquals((Float) layer.getLineGapWidth().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineGapWidth(0.3f));
+        assertEquals((Float) layer.getLineGapWidth().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -726,26 +900,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineGapWidth(
-        zoom(
-          exponential(
-            stop(2, lineGapWidth(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineGapWidth());
-    assertNotNull(layer.getLineGapWidth().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineGapWidth().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getLineGapWidth().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getLineGapWidth().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getLineGapWidth().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineGapWidth(
+            zoom(
+              exponential(
+                stop(2, lineGapWidth(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineGapWidth());
+        assertNotNull(layer.getLineGapWidth().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineGapWidth().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getLineGapWidth().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getLineGapWidth().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getLineGapWidth().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -753,19 +932,24 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineGapWidth(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getLineGapWidth());
-    assertNotNull(layer.getLineGapWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineGapWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineGapWidth().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getLineGapWidth().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineGapWidth(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getLineGapWidth());
+        assertNotNull(layer.getLineGapWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineGapWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineGapWidth().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getLineGapWidth().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -773,26 +957,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineGapWidth(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, lineGapWidth(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineGapWidth());
-    assertNotNull(layer.getLineGapWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineGapWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineGapWidth().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getLineGapWidth().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineGapWidth(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, lineGapWidth(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineGapWidth());
+        assertNotNull(layer.getLineGapWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineGapWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineGapWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineGapWidth().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -800,29 +989,35 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineGapWidth(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, lineGapWidth(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineGapWidth(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, lineGapWidth(0.3f))
+              )
+            ).withDefaultValue(lineGapWidth(0.3f))
           )
-        ).withDefaultValue(lineGapWidth(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineGapWidth());
-    assertNotNull(layer.getLineGapWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineGapWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineGapWidth().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getLineGapWidth().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getLineGapWidth().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getLineGapWidth().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getLineGapWidth().getFunction()).getDefaultValue().getValue());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineGapWidth());
+        assertNotNull(layer.getLineGapWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineGapWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineGapWidth().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getLineGapWidth().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getLineGapWidth().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getLineGapWidth().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getLineGapWidth().getFunction()).getDefaultValue().getValue());
+      }
+    });
+
   }
 
   @Test
@@ -830,34 +1025,39 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineGapWidth(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, lineGapWidth(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(lineGapWidth(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineGapWidth());
-    assertNotNull(layer.getLineGapWidth().getFunction());
-    assertEquals(CompositeFunction.class, layer.getLineGapWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineGapWidth().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getLineGapWidth().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getLineGapWidth().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineGapWidth().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineGapWidth(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, lineGapWidth(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(lineGapWidth(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineGapWidth());
+        assertNotNull(layer.getLineGapWidth().getFunction());
+        assertEquals(CompositeFunction.class, layer.getLineGapWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineGapWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineGapWidth().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getLineGapWidth().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineGapWidth().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -865,12 +1065,17 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offsetTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setLineOffsetTransition(options);
-    assertEquals(layer.getLineOffsetTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setLineOffsetTransition(options);
+        assertEquals(layer.getLineOffsetTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -878,11 +1083,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineOffset(0.3f));
-    assertEquals((Float) layer.getLineOffset().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineOffset(0.3f));
+        assertEquals((Float) layer.getLineOffset().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -890,26 +1100,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineOffset(
-        zoom(
-          exponential(
-            stop(2, lineOffset(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineOffset());
-    assertNotNull(layer.getLineOffset().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineOffset().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getLineOffset().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getLineOffset().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getLineOffset().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineOffset(
+            zoom(
+              exponential(
+                stop(2, lineOffset(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineOffset());
+        assertNotNull(layer.getLineOffset().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineOffset().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getLineOffset().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getLineOffset().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getLineOffset().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -917,19 +1132,24 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineOffset(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getLineOffset());
-    assertNotNull(layer.getLineOffset().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineOffset().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOffset().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getLineOffset().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineOffset(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getLineOffset());
+        assertNotNull(layer.getLineOffset().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineOffset().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOffset().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getLineOffset().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -937,26 +1157,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineOffset(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, lineOffset(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineOffset());
-    assertNotNull(layer.getLineOffset().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineOffset().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOffset().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getLineOffset().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineOffset(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, lineOffset(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineOffset());
+        assertNotNull(layer.getLineOffset().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineOffset().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOffset().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineOffset().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -964,29 +1189,35 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineOffset(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, lineOffset(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineOffset(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, lineOffset(0.3f))
+              )
+            ).withDefaultValue(lineOffset(0.3f))
           )
-        ).withDefaultValue(lineOffset(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineOffset());
-    assertNotNull(layer.getLineOffset().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineOffset().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOffset().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getLineOffset().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getLineOffset().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getLineOffset().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getLineOffset().getFunction()).getDefaultValue().getValue());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineOffset());
+        assertNotNull(layer.getLineOffset().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineOffset().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineOffset().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getLineOffset().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getLineOffset().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getLineOffset().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getLineOffset().getFunction()).getDefaultValue().getValue());
+      }
+    });
+
   }
 
   @Test
@@ -994,34 +1225,39 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineOffset(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, lineOffset(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(lineOffset(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineOffset());
-    assertNotNull(layer.getLineOffset().getFunction());
-    assertEquals(CompositeFunction.class, layer.getLineOffset().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineOffset().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getLineOffset().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getLineOffset().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineOffset().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineOffset(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, lineOffset(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(lineOffset(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineOffset());
+        assertNotNull(layer.getLineOffset().getFunction());
+        assertEquals(CompositeFunction.class, layer.getLineOffset().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineOffset().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineOffset().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getLineOffset().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineOffset().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -1029,12 +1265,17 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blurTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setLineBlurTransition(options);
-    assertEquals(layer.getLineBlurTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setLineBlurTransition(options);
+        assertEquals(layer.getLineBlurTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -1042,11 +1283,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineBlur(0.3f));
-    assertEquals((Float) layer.getLineBlur().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineBlur(0.3f));
+        assertEquals((Float) layer.getLineBlur().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -1054,26 +1300,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineBlur(
-        zoom(
-          exponential(
-            stop(2, lineBlur(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineBlur());
-    assertNotNull(layer.getLineBlur().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineBlur().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getLineBlur().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getLineBlur().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getLineBlur().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineBlur(
+            zoom(
+              exponential(
+                stop(2, lineBlur(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineBlur());
+        assertNotNull(layer.getLineBlur().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineBlur().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getLineBlur().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getLineBlur().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getLineBlur().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1081,19 +1332,24 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineBlur(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.getLineBlur());
-    assertNotNull(layer.getLineBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineBlur().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getLineBlur().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineBlur(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getLineBlur());
+        assertNotNull(layer.getLineBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineBlur().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getLineBlur().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1101,26 +1357,31 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineBlur(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, lineBlur(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineBlur());
-    assertNotNull(layer.getLineBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineBlur().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getLineBlur().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineBlur(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, lineBlur(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineBlur());
+        assertNotNull(layer.getLineBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineBlur().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineBlur().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1128,29 +1389,35 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineBlur(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, lineBlur(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineBlur(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, lineBlur(0.3f))
+              )
+            ).withDefaultValue(lineBlur(0.3f))
           )
-        ).withDefaultValue(lineBlur(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineBlur());
-    assertNotNull(layer.getLineBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getLineBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineBlur().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getLineBlur().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getLineBlur().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getLineBlur().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getLineBlur().getFunction()).getDefaultValue().getValue());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineBlur());
+        assertNotNull(layer.getLineBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineBlur().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getLineBlur().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getLineBlur().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getLineBlur().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getLineBlur().getFunction()).getDefaultValue().getValue());
+      }
+    });
+
   }
 
   @Test
@@ -1158,34 +1425,39 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineBlur(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, lineBlur(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(lineBlur(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineBlur());
-    assertNotNull(layer.getLineBlur().getFunction());
-    assertEquals(CompositeFunction.class, layer.getLineBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineBlur().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getLineBlur().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getLineBlur().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineBlur().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineBlur(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, lineBlur(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(lineBlur(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineBlur());
+        assertNotNull(layer.getLineBlur().getFunction());
+        assertEquals(CompositeFunction.class, layer.getLineBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineBlur().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineBlur().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getLineBlur().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineBlur().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -1193,12 +1465,17 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-dasharrayTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setLineDasharrayTransition(options);
-    assertEquals(layer.getLineDasharrayTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setLineDasharrayTransition(options);
+        assertEquals(layer.getLineDasharrayTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -1206,11 +1483,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-dasharray");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(lineDasharray(new Float[]{}));
-    assertEquals((Float[]) layer.getLineDasharray().getValue(), (Float[]) new Float[]{});
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(lineDasharray(new Float[] {}));
+        assertEquals((Float[]) layer.getLineDasharray().getValue(), (Float[]) new Float[] {});
+      }
+    });
   }
 
   @Test
@@ -1218,25 +1500,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-dasharray");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      lineDasharray(
-        zoom(
-          interval(
-            stop(2, lineDasharray(new Float[]{}))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineDasharray(
+            zoom(
+              interval(
+                stop(2, lineDasharray(new Float[] {}))
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLineDasharray());
-    assertNotNull(layer.getLineDasharray().getFunction());
-    assertEquals(CameraFunction.class, layer.getLineDasharray().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getLineDasharray().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getLineDasharray().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineDasharray());
+        assertNotNull(layer.getLineDasharray().getFunction());
+        assertEquals(CameraFunction.class, layer.getLineDasharray().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getLineDasharray().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getLineDasharray().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1244,12 +1531,17 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-patternTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setLinePatternTransition(options);
-    assertEquals(layer.getLinePatternTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setLinePatternTransition(options);
+        assertEquals(layer.getLinePatternTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -1257,11 +1549,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-pattern");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(linePattern("pedestrian-polygon"));
-    assertEquals((String) layer.getLinePattern().getValue(), (String) "pedestrian-polygon");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(linePattern("pedestrian-polygon"));
+        assertEquals((String) layer.getLinePattern().getValue(), (String) "pedestrian-polygon");
+      }
+    });
   }
 
   @Test
@@ -1269,25 +1566,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-pattern");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      linePattern(
-        zoom(
-          interval(
-            stop(2, linePattern("pedestrian-polygon"))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          linePattern(
+            zoom(
+              interval(
+                stop(2, linePattern("pedestrian-polygon"))
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getLinePattern());
-    assertNotNull(layer.getLinePattern().getFunction());
-    assertEquals(CameraFunction.class, layer.getLinePattern().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getLinePattern().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getLinePattern().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getLinePattern());
+        assertNotNull(layer.getLinePattern().getFunction());
+        assertEquals(CameraFunction.class, layer.getLinePattern().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getLinePattern().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getLinePattern().getFunction().getStops()).size());
+      }
+    });
   }
 
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
index 2a0d3401fb..020effe331 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
@@ -3,9 +3,9 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
+
 import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -19,20 +19,16 @@ import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
 import com.mapbox.mapboxsdk.style.layers.RasterLayer;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static com.mapbox.mapboxsdk.style.functions.Function.*;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
@@ -53,15 +49,21 @@ public class RasterLayerTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private void setupLayer(){
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new RasterLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  private void setupLayer() {
+    Timber.i("Retrieving layer");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
+          Timber.i("Adding layer");
+          layer = new RasterLayer("my-layer", "composite");
+          layer.setSourceLayer("composite");
+          mapboxMap.addLayer(layer);
+          // Layer reference is now stale, get new reference
+          layer = mapboxMap.getLayerAs("my-layer");
+        }
+      }
+    });
   }
 
   @Test
@@ -69,14 +71,19 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
-
-    // Get initial
-    assertEquals(layer.getVisibility().getValue(), VISIBLE);
-
-    // Set
-    layer.setProperties(visibility(NONE));
-    assertEquals(layer.getVisibility().getValue(), NONE);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Get initial
+        assertEquals(layer.getVisibility().getValue(), VISIBLE);
+
+        // Set
+        layer.setProperties(visibility(NONE));
+        assertEquals(layer.getVisibility().getValue(), NONE);
+      }
+    });
   }
 
   @Test
@@ -84,12 +91,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacityTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterOpacityTransition(options);
-    assertEquals(layer.getRasterOpacityTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setRasterOpacityTransition(options);
+        assertEquals(layer.getRasterOpacityTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -97,11 +109,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacity");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterOpacity(0.3f));
-    assertEquals((Float) layer.getRasterOpacity().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterOpacity(0.3f));
+        assertEquals((Float) layer.getRasterOpacity().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -109,26 +126,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterOpacity(
-        zoom(
-          exponential(
-            stop(2, rasterOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterOpacity());
-    assertNotNull(layer.getRasterOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterOpacity(
+            zoom(
+              exponential(
+                stop(2, rasterOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterOpacity());
+        assertNotNull(layer.getRasterOpacity().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterOpacity().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterOpacity().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -136,12 +158,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotateTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterHueRotateTransition(options);
-    assertEquals(layer.getRasterHueRotateTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setRasterHueRotateTransition(options);
+        assertEquals(layer.getRasterHueRotateTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -149,11 +176,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotate");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterHueRotate(0.3f));
-    assertEquals((Float) layer.getRasterHueRotate().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterHueRotate(0.3f));
+        assertEquals((Float) layer.getRasterHueRotate().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -161,26 +193,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterHueRotate(
-        zoom(
-          exponential(
-            stop(2, rasterHueRotate(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterHueRotate());
-    assertNotNull(layer.getRasterHueRotate().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterHueRotate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterHueRotate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterHueRotate(
+            zoom(
+              exponential(
+                stop(2, rasterHueRotate(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterHueRotate());
+        assertNotNull(layer.getRasterHueRotate().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterHueRotate().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterHueRotate().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -188,12 +225,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-minTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterBrightnessMinTransition(options);
-    assertEquals(layer.getRasterBrightnessMinTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setRasterBrightnessMinTransition(options);
+        assertEquals(layer.getRasterBrightnessMinTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -201,11 +243,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-min");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterBrightnessMin(0.3f));
-    assertEquals((Float) layer.getRasterBrightnessMin().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterBrightnessMin(0.3f));
+        assertEquals((Float) layer.getRasterBrightnessMin().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -213,26 +260,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-min");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterBrightnessMin(
-        zoom(
-          exponential(
-            stop(2, rasterBrightnessMin(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterBrightnessMin());
-    assertNotNull(layer.getRasterBrightnessMin().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterBrightnessMin().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterBrightnessMin().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterBrightnessMin(
+            zoom(
+              exponential(
+                stop(2, rasterBrightnessMin(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterBrightnessMin());
+        assertNotNull(layer.getRasterBrightnessMin().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterBrightnessMin().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterBrightnessMin().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -240,12 +292,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-maxTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterBrightnessMaxTransition(options);
-    assertEquals(layer.getRasterBrightnessMaxTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setRasterBrightnessMaxTransition(options);
+        assertEquals(layer.getRasterBrightnessMaxTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -253,11 +310,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-max");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterBrightnessMax(0.3f));
-    assertEquals((Float) layer.getRasterBrightnessMax().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterBrightnessMax(0.3f));
+        assertEquals((Float) layer.getRasterBrightnessMax().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -265,26 +327,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-max");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterBrightnessMax(
-        zoom(
-          exponential(
-            stop(2, rasterBrightnessMax(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterBrightnessMax());
-    assertNotNull(layer.getRasterBrightnessMax().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterBrightnessMax().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterBrightnessMax().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterBrightnessMax(
+            zoom(
+              exponential(
+                stop(2, rasterBrightnessMax(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterBrightnessMax());
+        assertNotNull(layer.getRasterBrightnessMax().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterBrightnessMax().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterBrightnessMax().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -292,12 +359,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturationTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterSaturationTransition(options);
-    assertEquals(layer.getRasterSaturationTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setRasterSaturationTransition(options);
+        assertEquals(layer.getRasterSaturationTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -305,11 +377,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturation");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterSaturation(0.3f));
-    assertEquals((Float) layer.getRasterSaturation().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterSaturation(0.3f));
+        assertEquals((Float) layer.getRasterSaturation().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -317,26 +394,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturation");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterSaturation(
-        zoom(
-          exponential(
-            stop(2, rasterSaturation(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterSaturation());
-    assertNotNull(layer.getRasterSaturation().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterSaturation().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterSaturation().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterSaturation(
+            zoom(
+              exponential(
+                stop(2, rasterSaturation(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterSaturation());
+        assertNotNull(layer.getRasterSaturation().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterSaturation().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterSaturation().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -344,12 +426,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrastTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterContrastTransition(options);
-    assertEquals(layer.getRasterContrastTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setRasterContrastTransition(options);
+        assertEquals(layer.getRasterContrastTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -357,11 +444,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrast");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterContrast(0.3f));
-    assertEquals((Float) layer.getRasterContrast().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterContrast(0.3f));
+        assertEquals((Float) layer.getRasterContrast().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -369,26 +461,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrast");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterContrast(
-        zoom(
-          exponential(
-            stop(2, rasterContrast(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterContrast());
-    assertNotNull(layer.getRasterContrast().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterContrast().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterContrast().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterContrast(
+            zoom(
+              exponential(
+                stop(2, rasterContrast(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterContrast());
+        assertNotNull(layer.getRasterContrast().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterContrast().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterContrast().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -396,12 +493,17 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-fade-durationTransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setRasterFadeDurationTransition(options);
-    assertEquals(layer.getRasterFadeDurationTransition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setRasterFadeDurationTransition(options);
+        assertEquals(layer.getRasterFadeDurationTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -409,11 +511,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-fade-duration");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(rasterFadeDuration(0.3f));
-    assertEquals((Float) layer.getRasterFadeDuration().getValue(), (Float) 0.3f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(rasterFadeDuration(0.3f));
+        assertEquals((Float) layer.getRasterFadeDuration().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -421,26 +528,31 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-fade-duration");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      rasterFadeDuration(
-        zoom(
-          exponential(
-            stop(2, rasterFadeDuration(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getRasterFadeDuration());
-    assertNotNull(layer.getRasterFadeDuration().getFunction());
-    assertEquals(CameraFunction.class, layer.getRasterFadeDuration().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getRasterFadeDuration().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          rasterFadeDuration(
+            zoom(
+              exponential(
+                stop(2, rasterFadeDuration(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getRasterFadeDuration());
+        assertNotNull(layer.getRasterFadeDuration().getFunction());
+        assertEquals(CameraFunction.class, layer.getRasterFadeDuration().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getRasterFadeDuration().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).size());
+      }
+    });
   }
 
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleBackgroundLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleBackgroundLayerTest.java
deleted file mode 100644
index c95c959644..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleBackgroundLayerTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.style;
-
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.test.ActivityInstrumentationTestCase2;
-
-import timber.log.Timber;
-
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.style.layers.BackgroundLayer;
-import com.mapbox.mapboxsdk.style.layers.Property;
-import com.mapbox.mapboxsdk.style.layers.PropertyFactory;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Basic smoke tests for BackgroundLayer
- */
-@RunWith(AndroidJUnit4.class)
-public class RuntimeStyleBackgroundLayerTest
-  extends ActivityInstrumentationTestCase2<RuntimeStyleTestActivity> {
-
-  public RuntimeStyleBackgroundLayerTest() {
-    super(RuntimeStyleTestActivity.class);
-  }
-
-  @Before
-  public void setUp() throws Exception {
-    super.setUp();
-    injectInstrumentation(InstrumentationRegistry.getInstrumentation());
-  }
-
-  @Test
-  public void testSetVisibility() {
-    getActivity().mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(MapboxMap mapboxMap) {
-        Timber.i("visibility");
-        BackgroundLayer layer = mapboxMap.getLayerAs("background");
-        assertNotNull(layer);
-
-        // Get initial
-        assertEquals(layer.getVisibility().getValue(), Property.VISIBLE);
-
-        // Set
-        layer.setProperties(PropertyFactory.visibility(Property.NONE));
-        assertEquals(layer.getVisibility().getValue(), Property.NONE);
-      }
-    });
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    super.tearDown();
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
index a37615aadc..bf8bcb9f66 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java
@@ -8,6 +8,7 @@ import android.support.test.espresso.ViewAction;
 import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 
+import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.CannotAddLayerException;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
 import com.mapbox.mapboxsdk.style.layers.FillLayer;
@@ -21,6 +22,7 @@ import com.mapbox.mapboxsdk.style.sources.RasterSource;
 import com.mapbox.mapboxsdk.style.sources.Source;
 import com.mapbox.mapboxsdk.style.sources.VectorSource;
 import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
 
@@ -40,6 +42,7 @@ import timber.log.Timber;
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -189,39 +192,89 @@ public class RuntimeStyleTests extends BaseActivityTest {
   @Test
   public void testAddRemoveSource() {
     validateTestSetup();
-    mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
-    mapboxMap.removeSource("my-source");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
+        mapboxMap.removeSource("my-source");
+
+        // Add initial source
+        mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
+
+        // Remove
+        Source mySource = mapboxMap.removeSource("my-source");
+        assertNotNull(mySource);
+        assertNull(mapboxMap.getLayer("my-source"));
+
+        // Add
+        Source source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+        mapboxMap.addSource(source);
+
+        // Remove, preserving the reference
+        mapboxMap.removeSource(source);
+
+        // Re-add the reference...
+        mapboxMap.addSource(source);
+
+        // Ensure it's there
+        Assert.assertNotNull(mapboxMap.getSource(source.getId()));
+
+        // Test adding a duplicate source
+        try {
+          Source source2 = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+          mapboxMap.addSource(source2);
+          fail("Should not have been allowed to add a source with a duplicate id");
+        } catch (CannotAddSourceException cannotAddSourceException) {
+          // OK
+        }
+      }
+    });
 
-    onView(withId(R.id.mapView)).perform(new AddRemoveSourceAction());
   }
 
   @Test
   public void testVectorSourceUrlGetter() {
     validateTestSetup();
-
-    VectorSource source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-    mapboxMap.addSource(source);
-    assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        VectorSource source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+        mapboxMap.addSource(source);
+        assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
+      }
+    });
   }
 
   @Test
   public void testRasterSourceUrlGetter() {
     validateTestSetup();
-
-    RasterSource source = new RasterSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-    mapboxMap.addSource(source);
-    assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        RasterSource source = new RasterSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+        mapboxMap.addSource(source);
+        assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl());
+      }
+    });
   }
 
   @Test
   public void testGeoJsonSourceUrlGetter() throws MalformedURLException {
     validateTestSetup();
-
-    GeoJsonSource source = new GeoJsonSource("my-source");
-    mapboxMap.addSource(source);
-    assertNull(source.getUrl());
-    source.setUrl(new URL("http://mapbox.com/my-file.json"));
-    assertEquals("http://mapbox.com/my-file.json", source.getUrl());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        GeoJsonSource source = new GeoJsonSource("my-source");
+        mapboxMap.addSource(source);
+        assertNull(source.getUrl());
+        try {
+          source.setUrl(new URL("http://mapbox.com/my-file.json"));
+        } catch (MalformedURLException exception) {
+          fail();
+        }
+        assertEquals("http://mapbox.com/my-file.json", source.getUrl());
+      }
+    });
   }
 
   @Test
@@ -304,42 +357,6 @@ public class RuntimeStyleTests extends BaseActivityTest {
     }
   }
 
-  private class AddRemoveSourceAction extends BaseViewAction {
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      // Add initial source
-      mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
-
-      // Remove
-      Source mySource = mapboxMap.removeSource("my-source");
-      assertNotNull(mySource);
-      assertNull(mapboxMap.getLayer("my-source"));
-
-      // Add
-      Source source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-      mapboxMap.addSource(source);
-
-      // Remove, preserving the reference
-      mapboxMap.removeSource(source);
-
-      // Re-add the reference...
-      mapboxMap.addSource(source);
-
-      // Ensure it's there
-      Assert.assertNotNull(mapboxMap.getSource(source.getId()));
-
-      // Test adding a duplicate source
-      try {
-        Source source2 = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
-        mapboxMap.addSource(source2);
-        fail("Should not have been allowed to add a source with a duplicate id");
-      } catch (CannotAddSourceException cannotAddSourceException) {
-        // OK
-      }
-    }
-  }
-
   @After
   public void unregisterIntentServiceIdlingResource() {
     Espresso.unregisterIdlingResources(idlingResource);
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
index 737a66713a..b0854f4a47 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
@@ -3,9 +3,9 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
+
 import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -19,20 +19,16 @@ import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
 import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static com.mapbox.mapboxsdk.style.functions.Function.*;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
@@ -53,15 +49,21 @@ public class SymbolLayerTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private void setupLayer(){
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new SymbolLayer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+  private void setupLayer() {
+    Timber.i("Retrieving layer");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
+          Timber.i("Adding layer");
+          layer = new SymbolLayer("my-layer", "composite");
+          layer.setSourceLayer("composite");
+          mapboxMap.addLayer(layer);
+          // Layer reference is now stale, get new reference
+          layer = mapboxMap.getLayerAs("my-layer");
+        }
+      }
+    });
   }
 
   @Test
@@ -69,14 +71,19 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Get initial
-    assertEquals(layer.getVisibility().getValue(), VISIBLE);
+        // Get initial
+        assertEquals(layer.getVisibility().getValue(), VISIBLE);
 
-    // Set
-    layer.setProperties(visibility(NONE));
-    assertEquals(layer.getVisibility().getValue(), NONE);
+        // Set
+        layer.setProperties(visibility(NONE));
+        assertEquals(layer.getVisibility().getValue(), NONE);
+      }
+    });
   }
 
   @Test
@@ -84,15 +91,20 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Get initial
-    assertEquals(layer.getSourceLayer(), "composite");
+        // Get initial
+        assertEquals(layer.getSourceLayer(), "composite");
 
-    // Set
-    final String sourceLayer = "test";
-    layer.setSourceLayer(sourceLayer);
-    assertEquals(layer.getSourceLayer(), sourceLayer);
+        // Set
+        final String sourceLayer = "test";
+        layer.setSourceLayer(sourceLayer);
+        assertEquals(layer.getSourceLayer(), sourceLayer);
+      }
+    });
   }
 
   @Test
@@ -100,11 +112,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-placement");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(symbolPlacement(SYMBOL_PLACEMENT_POINT));
-    assertEquals((String) layer.getSymbolPlacement().getValue(), (String) SYMBOL_PLACEMENT_POINT);
+        // Set and Get
+        layer.setProperties(symbolPlacement(SYMBOL_PLACEMENT_POINT));
+        assertEquals((String) layer.getSymbolPlacement().getValue(), (String) SYMBOL_PLACEMENT_POINT);
+      }
+    });
   }
 
   @Test
@@ -112,25 +129,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-placement");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      symbolPlacement(
-        zoom(
-          interval(
-            stop(2, symbolPlacement(SYMBOL_PLACEMENT_POINT))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          symbolPlacement(
+            zoom(
+              interval(
+                stop(2, symbolPlacement(SYMBOL_PLACEMENT_POINT))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getSymbolPlacement());
-    assertNotNull(layer.getSymbolPlacement().getFunction());
-    assertEquals(CameraFunction.class, layer.getSymbolPlacement().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getSymbolPlacement().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getSymbolPlacement().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getSymbolPlacement());
+        assertNotNull(layer.getSymbolPlacement().getFunction());
+        assertEquals(CameraFunction.class, layer.getSymbolPlacement().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getSymbolPlacement().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getSymbolPlacement().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -138,11 +160,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-spacing");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(symbolSpacing(0.3f));
-    assertEquals((Float) layer.getSymbolSpacing().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(symbolSpacing(0.3f));
+        assertEquals((Float) layer.getSymbolSpacing().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -150,26 +177,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-spacing");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      symbolSpacing(
-        zoom(
-          exponential(
-            stop(2, symbolSpacing(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          symbolSpacing(
+            zoom(
+              exponential(
+                stop(2, symbolSpacing(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getSymbolSpacing());
-    assertNotNull(layer.getSymbolSpacing().getFunction());
-    assertEquals(CameraFunction.class, layer.getSymbolSpacing().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getSymbolSpacing().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getSymbolSpacing().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getSymbolSpacing().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getSymbolSpacing());
+        assertNotNull(layer.getSymbolSpacing().getFunction());
+        assertEquals(CameraFunction.class, layer.getSymbolSpacing().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getSymbolSpacing().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getSymbolSpacing().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getSymbolSpacing().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -177,11 +209,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-avoid-edges");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(symbolAvoidEdges(true));
-    assertEquals((Boolean) layer.getSymbolAvoidEdges().getValue(), (Boolean) true);
+        // Set and Get
+        layer.setProperties(symbolAvoidEdges(true));
+        assertEquals((Boolean) layer.getSymbolAvoidEdges().getValue(), (Boolean) true);
+      }
+    });
   }
 
   @Test
@@ -189,25 +226,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-avoid-edges");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      symbolAvoidEdges(
-        zoom(
-          interval(
-            stop(2, symbolAvoidEdges(true))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          symbolAvoidEdges(
+            zoom(
+              interval(
+                stop(2, symbolAvoidEdges(true))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getSymbolAvoidEdges());
-    assertNotNull(layer.getSymbolAvoidEdges().getFunction());
-    assertEquals(CameraFunction.class, layer.getSymbolAvoidEdges().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getSymbolAvoidEdges().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getSymbolAvoidEdges().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getSymbolAvoidEdges());
+        assertNotNull(layer.getSymbolAvoidEdges().getFunction());
+        assertEquals(CameraFunction.class, layer.getSymbolAvoidEdges().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getSymbolAvoidEdges().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getSymbolAvoidEdges().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -215,11 +257,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-allow-overlap");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconAllowOverlap(true));
-    assertEquals((Boolean) layer.getIconAllowOverlap().getValue(), (Boolean) true);
+        // Set and Get
+        layer.setProperties(iconAllowOverlap(true));
+        assertEquals((Boolean) layer.getIconAllowOverlap().getValue(), (Boolean) true);
+      }
+    });
   }
 
   @Test
@@ -227,25 +274,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-allow-overlap");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconAllowOverlap(
-        zoom(
-          interval(
-            stop(2, iconAllowOverlap(true))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconAllowOverlap(
+            zoom(
+              interval(
+                stop(2, iconAllowOverlap(true))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getIconAllowOverlap());
-    assertNotNull(layer.getIconAllowOverlap().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconAllowOverlap().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getIconAllowOverlap().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getIconAllowOverlap().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconAllowOverlap());
+        assertNotNull(layer.getIconAllowOverlap().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconAllowOverlap().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getIconAllowOverlap().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getIconAllowOverlap().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -253,11 +305,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-ignore-placement");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconIgnorePlacement(true));
-    assertEquals((Boolean) layer.getIconIgnorePlacement().getValue(), (Boolean) true);
+        // Set and Get
+        layer.setProperties(iconIgnorePlacement(true));
+        assertEquals((Boolean) layer.getIconIgnorePlacement().getValue(), (Boolean) true);
+      }
+    });
   }
 
   @Test
@@ -265,25 +322,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-ignore-placement");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconIgnorePlacement(
-        zoom(
-          interval(
-            stop(2, iconIgnorePlacement(true))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconIgnorePlacement(
+            zoom(
+              interval(
+                stop(2, iconIgnorePlacement(true))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getIconIgnorePlacement());
-    assertNotNull(layer.getIconIgnorePlacement().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconIgnorePlacement().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getIconIgnorePlacement().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getIconIgnorePlacement().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconIgnorePlacement());
+        assertNotNull(layer.getIconIgnorePlacement().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconIgnorePlacement().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getIconIgnorePlacement().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getIconIgnorePlacement().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -291,11 +353,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-optional");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconOptional(true));
-    assertEquals((Boolean) layer.getIconOptional().getValue(), (Boolean) true);
+        // Set and Get
+        layer.setProperties(iconOptional(true));
+        assertEquals((Boolean) layer.getIconOptional().getValue(), (Boolean) true);
+      }
+    });
   }
 
   @Test
@@ -303,25 +370,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-optional");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconOptional(
-        zoom(
-          interval(
-            stop(2, iconOptional(true))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconOptional(
+            zoom(
+              interval(
+                stop(2, iconOptional(true))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getIconOptional());
-    assertNotNull(layer.getIconOptional().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconOptional().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getIconOptional().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getIconOptional().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconOptional());
+        assertNotNull(layer.getIconOptional().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconOptional().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getIconOptional().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getIconOptional().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -329,11 +401,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotation-alignment");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP));
-    assertEquals((String) layer.getIconRotationAlignment().getValue(), (String) ICON_ROTATION_ALIGNMENT_MAP);
+        // Set and Get
+        layer.setProperties(iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP));
+        assertEquals((String) layer.getIconRotationAlignment().getValue(), (String) ICON_ROTATION_ALIGNMENT_MAP);
+      }
+    });
   }
 
   @Test
@@ -341,25 +418,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotation-alignment");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconRotationAlignment(
-        zoom(
-          interval(
-            stop(2, iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconRotationAlignment(
+            zoom(
+              interval(
+                stop(2, iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getIconRotationAlignment());
-    assertNotNull(layer.getIconRotationAlignment().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconRotationAlignment().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getIconRotationAlignment().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getIconRotationAlignment().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconRotationAlignment());
+        assertNotNull(layer.getIconRotationAlignment().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconRotationAlignment().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getIconRotationAlignment().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getIconRotationAlignment().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -367,11 +449,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconSize(0.3f));
-    assertEquals((Float) layer.getIconSize().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(iconSize(0.3f));
+        assertEquals((Float) layer.getIconSize().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -379,26 +466,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconSize(
-        zoom(
-          exponential(
-            stop(2, iconSize(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconSize(
+            zoom(
+              exponential(
+                stop(2, iconSize(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconSize());
-    assertNotNull(layer.getIconSize().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconSize().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconSize().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconSize().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconSize().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconSize());
+        assertNotNull(layer.getIconSize().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconSize().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconSize().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconSize().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconSize().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -406,19 +498,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      iconSize(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          iconSize(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getIconSize());
-    assertNotNull(layer.getIconSize().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconSize().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconSize().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getIconSize().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconSize());
+        assertNotNull(layer.getIconSize().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconSize().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconSize().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getIconSize().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -426,26 +523,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconSize(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, iconSize(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconSize(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, iconSize(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconSize());
-    assertNotNull(layer.getIconSize().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconSize().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconSize().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconSize().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconSize());
+        assertNotNull(layer.getIconSize().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconSize().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconSize().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconSize().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -453,29 +555,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconSize(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, iconSize(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconSize(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, iconSize(0.3f))
+              )
+            ).withDefaultValue(iconSize(0.3f))
           )
-        ).withDefaultValue(iconSize(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getIconSize());
+        assertNotNull(layer.getIconSize().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconSize().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconSize().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getIconSize().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getIconSize().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getIconSize().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getIconSize().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getIconSize());
-    assertNotNull(layer.getIconSize().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconSize().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconSize().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getIconSize().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getIconSize().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getIconSize().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getIconSize().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -483,34 +591,39 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconSize(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, iconSize(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(iconSize(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getIconSize());
-    assertNotNull(layer.getIconSize().getFunction());
-    assertEquals(CompositeFunction.class, layer.getIconSize().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconSize().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconSize().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getIconSize().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconSize().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconSize(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, iconSize(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(iconSize(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getIconSize());
+        assertNotNull(layer.getIconSize().getFunction());
+        assertEquals(CompositeFunction.class, layer.getIconSize().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconSize().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconSize().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getIconSize().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconSize().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -518,11 +631,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-text-fit");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconTextFit(ICON_TEXT_FIT_NONE));
-    assertEquals((String) layer.getIconTextFit().getValue(), (String) ICON_TEXT_FIT_NONE);
+        // Set and Get
+        layer.setProperties(iconTextFit(ICON_TEXT_FIT_NONE));
+        assertEquals((String) layer.getIconTextFit().getValue(), (String) ICON_TEXT_FIT_NONE);
+      }
+    });
   }
 
   @Test
@@ -530,25 +648,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-text-fit");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconTextFit(
-        zoom(
-          interval(
-            stop(2, iconTextFit(ICON_TEXT_FIT_NONE))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconTextFit(
+            zoom(
+              interval(
+                stop(2, iconTextFit(ICON_TEXT_FIT_NONE))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getIconTextFit());
-    assertNotNull(layer.getIconTextFit().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconTextFit().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getIconTextFit().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getIconTextFit().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconTextFit());
+        assertNotNull(layer.getIconTextFit().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconTextFit().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getIconTextFit().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getIconTextFit().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -556,11 +679,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-text-fit-padding");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconTextFitPadding(new Float[]{0f,0f,0f,0f}));
-    assertEquals((Float[]) layer.getIconTextFitPadding().getValue(), (Float[]) new Float[]{0f,0f,0f,0f});
+        // Set and Get
+        layer.setProperties(iconTextFitPadding(new Float[] {0f, 0f, 0f, 0f}));
+        assertEquals((Float[]) layer.getIconTextFitPadding().getValue(), (Float[]) new Float[] {0f, 0f, 0f, 0f});
+      }
+    });
   }
 
   @Test
@@ -568,26 +696,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-text-fit-padding");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconTextFitPadding(
-        zoom(
-          exponential(
-            stop(2, iconTextFitPadding(new Float[]{0f,0f,0f,0f}))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconTextFitPadding(
+            zoom(
+              exponential(
+                stop(2, iconTextFitPadding(new Float[] {0f, 0f, 0f, 0f}))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconTextFitPadding());
-    assertNotNull(layer.getIconTextFitPadding().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconTextFitPadding().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconTextFitPadding().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconTextFitPadding().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconTextFitPadding().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconTextFitPadding());
+        assertNotNull(layer.getIconTextFitPadding().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconTextFitPadding().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconTextFitPadding().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconTextFitPadding().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconTextFitPadding().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -595,11 +728,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-image");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconImage("undefined"));
-    assertEquals((String) layer.getIconImage().getValue(), (String) "undefined");
+        // Set and Get
+        layer.setProperties(iconImage("undefined"));
+        assertEquals((String) layer.getIconImage().getValue(), (String) "undefined");
+      }
+    });
   }
 
   @Test
@@ -607,25 +745,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-image");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconImage(
-        zoom(
-          interval(
-            stop(2, iconImage("undefined"))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconImage(
+            zoom(
+              interval(
+                stop(2, iconImage("undefined"))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getIconImage());
-    assertNotNull(layer.getIconImage().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconImage().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getIconImage().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getIconImage().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconImage());
+        assertNotNull(layer.getIconImage().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconImage().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getIconImage().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getIconImage().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -633,19 +776,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-image");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      iconImage(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+        // Set
+        layer.setProperties(
+          iconImage(property("FeaturePropertyA", Stops.<String>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getIconImage());
-    assertNotNull(layer.getIconImage().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconImage().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconImage().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getIconImage().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconImage());
+        assertNotNull(layer.getIconImage().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconImage().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconImage().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getIconImage().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -653,26 +801,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-image");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconImage(
-        property(
-          "FeaturePropertyA",
-          interval(
-            stop(1, iconImage("undefined"))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconImage(
+            property(
+              "FeaturePropertyA",
+              interval(
+                stop(1, iconImage("undefined"))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getIconImage());
-    assertNotNull(layer.getIconImage().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconImage().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconImage().getFunction()).getProperty());
-    assertEquals(IntervalStops.class, layer.getIconImage().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconImage());
+        assertNotNull(layer.getIconImage().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconImage().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconImage().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.getIconImage().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -680,11 +833,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconRotate(0.3f));
-    assertEquals((Float) layer.getIconRotate().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(iconRotate(0.3f));
+        assertEquals((Float) layer.getIconRotate().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -692,26 +850,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconRotate(
-        zoom(
-          exponential(
-            stop(2, iconRotate(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconRotate(
+            zoom(
+              exponential(
+                stop(2, iconRotate(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconRotate());
-    assertNotNull(layer.getIconRotate().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconRotate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconRotate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconRotate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconRotate().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconRotate());
+        assertNotNull(layer.getIconRotate().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconRotate().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconRotate().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconRotate().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconRotate().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -719,19 +882,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      iconRotate(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          iconRotate(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getIconRotate());
-    assertNotNull(layer.getIconRotate().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconRotate().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconRotate().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getIconRotate().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconRotate());
+        assertNotNull(layer.getIconRotate().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconRotate().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconRotate().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getIconRotate().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -739,26 +907,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconRotate(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, iconRotate(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconRotate(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, iconRotate(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconRotate());
-    assertNotNull(layer.getIconRotate().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconRotate().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconRotate().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconRotate().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconRotate());
+        assertNotNull(layer.getIconRotate().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconRotate().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconRotate().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconRotate().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -766,29 +939,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconRotate(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, iconRotate(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconRotate(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, iconRotate(0.3f))
+              )
+            ).withDefaultValue(iconRotate(0.3f))
           )
-        ).withDefaultValue(iconRotate(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getIconRotate());
+        assertNotNull(layer.getIconRotate().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconRotate().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconRotate().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getIconRotate().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getIconRotate().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getIconRotate().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getIconRotate().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getIconRotate());
-    assertNotNull(layer.getIconRotate().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconRotate().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconRotate().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getIconRotate().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getIconRotate().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getIconRotate().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getIconRotate().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -796,34 +975,39 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconRotate(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, iconRotate(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(iconRotate(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getIconRotate());
-    assertNotNull(layer.getIconRotate().getFunction());
-    assertEquals(CompositeFunction.class, layer.getIconRotate().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconRotate().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconRotate().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getIconRotate().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconRotate().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconRotate(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, iconRotate(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(iconRotate(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getIconRotate());
+        assertNotNull(layer.getIconRotate().getFunction());
+        assertEquals(CompositeFunction.class, layer.getIconRotate().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconRotate().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconRotate().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getIconRotate().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconRotate().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -831,11 +1015,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-padding");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconPadding(0.3f));
-    assertEquals((Float) layer.getIconPadding().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(iconPadding(0.3f));
+        assertEquals((Float) layer.getIconPadding().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -843,26 +1032,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-padding");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconPadding(
-        zoom(
-          exponential(
-            stop(2, iconPadding(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconPadding(
+            zoom(
+              exponential(
+                stop(2, iconPadding(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconPadding());
-    assertNotNull(layer.getIconPadding().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconPadding().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconPadding().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconPadding().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconPadding().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconPadding());
+        assertNotNull(layer.getIconPadding().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconPadding().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconPadding().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconPadding().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconPadding().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -870,11 +1064,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-keep-upright");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconKeepUpright(true));
-    assertEquals((Boolean) layer.getIconKeepUpright().getValue(), (Boolean) true);
+        // Set and Get
+        layer.setProperties(iconKeepUpright(true));
+        assertEquals((Boolean) layer.getIconKeepUpright().getValue(), (Boolean) true);
+      }
+    });
   }
 
   @Test
@@ -882,25 +1081,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-keep-upright");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconKeepUpright(
-        zoom(
-          interval(
-            stop(2, iconKeepUpright(true))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconKeepUpright(
+            zoom(
+              interval(
+                stop(2, iconKeepUpright(true))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getIconKeepUpright());
-    assertNotNull(layer.getIconKeepUpright().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconKeepUpright().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getIconKeepUpright().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getIconKeepUpright().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconKeepUpright());
+        assertNotNull(layer.getIconKeepUpright().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconKeepUpright().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getIconKeepUpright().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getIconKeepUpright().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -908,11 +1112,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-offset");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconOffset(new Float[]{0f,0f}));
-    assertEquals((Float[]) layer.getIconOffset().getValue(), (Float[]) new Float[]{0f,0f});
+        // Set and Get
+        layer.setProperties(iconOffset(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getIconOffset().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
+    });
   }
 
   @Test
@@ -920,26 +1129,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-offset");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconOffset(
-        zoom(
-          exponential(
-            stop(2, iconOffset(new Float[]{0f,0f}))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconOffset(
+            zoom(
+              exponential(
+                stop(2, iconOffset(new Float[] {0f, 0f}))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconOffset());
-    assertNotNull(layer.getIconOffset().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconOffset().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconOffset().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconOffset().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconOffset().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconOffset());
+        assertNotNull(layer.getIconOffset().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconOffset().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconOffset().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconOffset().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconOffset().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -947,19 +1161,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-offset");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      iconOffset(property("FeaturePropertyA", Stops.<Float[]>identity()))
-    );
+        // Set
+        layer.setProperties(
+          iconOffset(property("FeaturePropertyA", Stops.<Float[]>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getIconOffset());
-    assertNotNull(layer.getIconOffset().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconOffset().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconOffset().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getIconOffset().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconOffset());
+        assertNotNull(layer.getIconOffset().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconOffset().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconOffset().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getIconOffset().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -967,26 +1186,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-offset");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconOffset(
-        property(
-          "FeaturePropertyA",
-          interval(
-            stop(1, iconOffset(new Float[]{0f,0f}))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconOffset(
+            property(
+              "FeaturePropertyA",
+              interval(
+                stop(1, iconOffset(new Float[] {0f, 0f}))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getIconOffset());
-    assertNotNull(layer.getIconOffset().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconOffset().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconOffset().getFunction()).getProperty());
-    assertEquals(IntervalStops.class, layer.getIconOffset().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconOffset());
+        assertNotNull(layer.getIconOffset().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconOffset().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconOffset().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.getIconOffset().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -994,11 +1218,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-pitch-alignment");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textPitchAlignment(TEXT_PITCH_ALIGNMENT_MAP));
-    assertEquals((String) layer.getTextPitchAlignment().getValue(), (String) TEXT_PITCH_ALIGNMENT_MAP);
+        // Set and Get
+        layer.setProperties(textPitchAlignment(TEXT_PITCH_ALIGNMENT_MAP));
+        assertEquals((String) layer.getTextPitchAlignment().getValue(), (String) TEXT_PITCH_ALIGNMENT_MAP);
+      }
+    });
   }
 
   @Test
@@ -1006,25 +1235,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-pitch-alignment");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textPitchAlignment(
-        zoom(
-          interval(
-            stop(2, textPitchAlignment(TEXT_PITCH_ALIGNMENT_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textPitchAlignment(
+            zoom(
+              interval(
+                stop(2, textPitchAlignment(TEXT_PITCH_ALIGNMENT_MAP))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextPitchAlignment());
-    assertNotNull(layer.getTextPitchAlignment().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextPitchAlignment().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextPitchAlignment().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextPitchAlignment().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextPitchAlignment());
+        assertNotNull(layer.getTextPitchAlignment().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextPitchAlignment().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextPitchAlignment().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextPitchAlignment().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1032,11 +1266,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotation-alignment");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textRotationAlignment(TEXT_ROTATION_ALIGNMENT_MAP));
-    assertEquals((String) layer.getTextRotationAlignment().getValue(), (String) TEXT_ROTATION_ALIGNMENT_MAP);
+        // Set and Get
+        layer.setProperties(textRotationAlignment(TEXT_ROTATION_ALIGNMENT_MAP));
+        assertEquals((String) layer.getTextRotationAlignment().getValue(), (String) TEXT_ROTATION_ALIGNMENT_MAP);
+      }
+    });
   }
 
   @Test
@@ -1044,25 +1283,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotation-alignment");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textRotationAlignment(
-        zoom(
-          interval(
-            stop(2, textRotationAlignment(TEXT_ROTATION_ALIGNMENT_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textRotationAlignment(
+            zoom(
+              interval(
+                stop(2, textRotationAlignment(TEXT_ROTATION_ALIGNMENT_MAP))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextRotationAlignment());
-    assertNotNull(layer.getTextRotationAlignment().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextRotationAlignment().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextRotationAlignment().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextRotationAlignment().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextRotationAlignment());
+        assertNotNull(layer.getTextRotationAlignment().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextRotationAlignment().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextRotationAlignment().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextRotationAlignment().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1070,11 +1314,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-field");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textField(""));
-    assertEquals((String) layer.getTextField().getValue(), (String) "");
+        // Set and Get
+        layer.setProperties(textField(""));
+        assertEquals((String) layer.getTextField().getValue(), (String) "");
+      }
+    });
   }
 
   @Test
@@ -1082,25 +1331,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-field");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textField(
-        zoom(
-          interval(
-            stop(2, textField(""))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textField(
+            zoom(
+              interval(
+                stop(2, textField(""))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextField());
-    assertNotNull(layer.getTextField().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextField().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextField().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextField().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextField());
+        assertNotNull(layer.getTextField().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextField().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextField().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextField().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1108,19 +1362,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-field");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      textField(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+        // Set
+        layer.setProperties(
+          textField(property("FeaturePropertyA", Stops.<String>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getTextField());
-    assertNotNull(layer.getTextField().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextField().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextField().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getTextField().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextField());
+        assertNotNull(layer.getTextField().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextField().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextField().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextField().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1128,26 +1387,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-field");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textField(
-        property(
-          "FeaturePropertyA",
-          interval(
-            stop(1, textField(""))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textField(
+            property(
+              "FeaturePropertyA",
+              interval(
+                stop(1, textField(""))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextField());
-    assertNotNull(layer.getTextField().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextField().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextField().getFunction()).getProperty());
-    assertEquals(IntervalStops.class, layer.getTextField().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextField());
+        assertNotNull(layer.getTextField().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextField().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextField().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.getTextField().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1155,11 +1419,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-font");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textFont(new String[]{"Open Sans Regular", "Arial Unicode MS Regular"}));
-    assertEquals((String[]) layer.getTextFont().getValue(), (String[]) new String[]{"Open Sans Regular", "Arial Unicode MS Regular"});
+        // Set and Get
+        layer.setProperties(textFont(new String[]{"Open Sans Regular", "Arial Unicode MS Regular"}));
+        assertEquals((String[]) layer.getTextFont().getValue(), (String[]) new String[]{"Open Sans Regular", "Arial Unicode MS Regular"});
+      }
+    });
   }
 
   @Test
@@ -1167,25 +1436,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-font");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textFont(
-        zoom(
-          interval(
-            stop(2, textFont(new String[]{"Open Sans Regular", "Arial Unicode MS Regular"}))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textFont(
+            zoom(
+              interval(
+                stop(2, textFont(new String[]{"Open Sans Regular", "Arial Unicode MS Regular"}))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextFont());
-    assertNotNull(layer.getTextFont().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextFont().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextFont().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextFont().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextFont());
+        assertNotNull(layer.getTextFont().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextFont().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextFont().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextFont().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1193,11 +1467,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textSize(0.3f));
-    assertEquals((Float) layer.getTextSize().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(textSize(0.3f));
+        assertEquals((Float) layer.getTextSize().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -1205,26 +1484,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textSize(
-        zoom(
-          exponential(
-            stop(2, textSize(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textSize(
+            zoom(
+              exponential(
+                stop(2, textSize(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextSize());
-    assertNotNull(layer.getTextSize().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextSize().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextSize().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextSize().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextSize().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextSize());
+        assertNotNull(layer.getTextSize().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextSize().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextSize().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextSize().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextSize().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1232,19 +1516,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      textSize(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          textSize(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getTextSize());
-    assertNotNull(layer.getTextSize().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextSize().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextSize().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getTextSize().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextSize());
+        assertNotNull(layer.getTextSize().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextSize().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextSize().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextSize().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1252,26 +1541,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textSize(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, textSize(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textSize(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, textSize(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextSize());
-    assertNotNull(layer.getTextSize().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextSize().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextSize().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextSize().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextSize());
+        assertNotNull(layer.getTextSize().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextSize().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextSize().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextSize().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1279,29 +1573,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textSize(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, textSize(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textSize(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, textSize(0.3f))
+              )
+            ).withDefaultValue(textSize(0.3f))
           )
-        ).withDefaultValue(textSize(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getTextSize());
+        assertNotNull(layer.getTextSize().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextSize().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextSize().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getTextSize().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getTextSize().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getTextSize().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getTextSize().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getTextSize());
-    assertNotNull(layer.getTextSize().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextSize().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextSize().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getTextSize().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getTextSize().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getTextSize().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getTextSize().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -1309,34 +1609,39 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textSize(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, textSize(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(textSize(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getTextSize());
-    assertNotNull(layer.getTextSize().getFunction());
-    assertEquals(CompositeFunction.class, layer.getTextSize().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextSize().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextSize().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getTextSize().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextSize().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textSize(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, textSize(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(textSize(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getTextSize());
+        assertNotNull(layer.getTextSize().getFunction());
+        assertEquals(CompositeFunction.class, layer.getTextSize().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextSize().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextSize().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getTextSize().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextSize().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -1344,11 +1649,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-width");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textMaxWidth(0.3f));
-    assertEquals((Float) layer.getTextMaxWidth().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(textMaxWidth(0.3f));
+        assertEquals((Float) layer.getTextMaxWidth().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -1356,26 +1666,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textMaxWidth(
-        zoom(
-          exponential(
-            stop(2, textMaxWidth(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textMaxWidth(
+            zoom(
+              exponential(
+                stop(2, textMaxWidth(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextMaxWidth());
-    assertNotNull(layer.getTextMaxWidth().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextMaxWidth().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextMaxWidth().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextMaxWidth().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextMaxWidth().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextMaxWidth());
+        assertNotNull(layer.getTextMaxWidth().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextMaxWidth().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextMaxWidth().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextMaxWidth().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextMaxWidth().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1383,11 +1698,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-line-height");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textLineHeight(0.3f));
-    assertEquals((Float) layer.getTextLineHeight().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(textLineHeight(0.3f));
+        assertEquals((Float) layer.getTextLineHeight().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -1395,26 +1715,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-line-height");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textLineHeight(
-        zoom(
-          exponential(
-            stop(2, textLineHeight(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textLineHeight(
+            zoom(
+              exponential(
+                stop(2, textLineHeight(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextLineHeight());
-    assertNotNull(layer.getTextLineHeight().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextLineHeight().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextLineHeight().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextLineHeight().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextLineHeight().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextLineHeight());
+        assertNotNull(layer.getTextLineHeight().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextLineHeight().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextLineHeight().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextLineHeight().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextLineHeight().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1422,11 +1747,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-letter-spacing");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textLetterSpacing(0.3f));
-    assertEquals((Float) layer.getTextLetterSpacing().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(textLetterSpacing(0.3f));
+        assertEquals((Float) layer.getTextLetterSpacing().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -1434,26 +1764,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-letter-spacing");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textLetterSpacing(
-        zoom(
-          exponential(
-            stop(2, textLetterSpacing(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textLetterSpacing(
+            zoom(
+              exponential(
+                stop(2, textLetterSpacing(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextLetterSpacing());
-    assertNotNull(layer.getTextLetterSpacing().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextLetterSpacing().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextLetterSpacing().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextLetterSpacing().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextLetterSpacing().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextLetterSpacing());
+        assertNotNull(layer.getTextLetterSpacing().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextLetterSpacing().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextLetterSpacing().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextLetterSpacing().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextLetterSpacing().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1461,11 +1796,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-justify");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textJustify(TEXT_JUSTIFY_LEFT));
-    assertEquals((String) layer.getTextJustify().getValue(), (String) TEXT_JUSTIFY_LEFT);
+        // Set and Get
+        layer.setProperties(textJustify(TEXT_JUSTIFY_LEFT));
+        assertEquals((String) layer.getTextJustify().getValue(), (String) TEXT_JUSTIFY_LEFT);
+      }
+    });
   }
 
   @Test
@@ -1473,25 +1813,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-justify");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textJustify(
-        zoom(
-          interval(
-            stop(2, textJustify(TEXT_JUSTIFY_LEFT))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textJustify(
+            zoom(
+              interval(
+                stop(2, textJustify(TEXT_JUSTIFY_LEFT))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextJustify());
-    assertNotNull(layer.getTextJustify().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextJustify().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextJustify().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextJustify().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextJustify());
+        assertNotNull(layer.getTextJustify().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextJustify().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextJustify().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextJustify().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1499,11 +1844,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-anchor");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textAnchor(TEXT_ANCHOR_CENTER));
-    assertEquals((String) layer.getTextAnchor().getValue(), (String) TEXT_ANCHOR_CENTER);
+        // Set and Get
+        layer.setProperties(textAnchor(TEXT_ANCHOR_CENTER));
+        assertEquals((String) layer.getTextAnchor().getValue(), (String) TEXT_ANCHOR_CENTER);
+      }
+    });
   }
 
   @Test
@@ -1511,25 +1861,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-anchor");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textAnchor(
-        zoom(
-          interval(
-            stop(2, textAnchor(TEXT_ANCHOR_CENTER))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textAnchor(
+            zoom(
+              interval(
+                stop(2, textAnchor(TEXT_ANCHOR_CENTER))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextAnchor());
-    assertNotNull(layer.getTextAnchor().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextAnchor().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextAnchor().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextAnchor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextAnchor());
+        assertNotNull(layer.getTextAnchor().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextAnchor().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextAnchor().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextAnchor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1537,11 +1892,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-angle");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textMaxAngle(0.3f));
-    assertEquals((Float) layer.getTextMaxAngle().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(textMaxAngle(0.3f));
+        assertEquals((Float) layer.getTextMaxAngle().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -1549,26 +1909,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-angle");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textMaxAngle(
-        zoom(
-          exponential(
-            stop(2, textMaxAngle(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textMaxAngle(
+            zoom(
+              exponential(
+                stop(2, textMaxAngle(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextMaxAngle());
-    assertNotNull(layer.getTextMaxAngle().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextMaxAngle().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextMaxAngle().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextMaxAngle().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextMaxAngle().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextMaxAngle());
+        assertNotNull(layer.getTextMaxAngle().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextMaxAngle().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextMaxAngle().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextMaxAngle().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextMaxAngle().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1576,11 +1941,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textRotate(0.3f));
-    assertEquals((Float) layer.getTextRotate().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(textRotate(0.3f));
+        assertEquals((Float) layer.getTextRotate().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -1588,26 +1958,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textRotate(
-        zoom(
-          exponential(
-            stop(2, textRotate(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textRotate(
+            zoom(
+              exponential(
+                stop(2, textRotate(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextRotate());
-    assertNotNull(layer.getTextRotate().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextRotate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextRotate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextRotate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextRotate().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextRotate());
+        assertNotNull(layer.getTextRotate().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextRotate().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextRotate().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextRotate().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextRotate().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1615,19 +1990,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      textRotate(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          textRotate(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getTextRotate());
-    assertNotNull(layer.getTextRotate().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextRotate().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextRotate().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getTextRotate().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextRotate());
+        assertNotNull(layer.getTextRotate().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextRotate().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextRotate().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextRotate().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1635,26 +2015,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textRotate(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, textRotate(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textRotate(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, textRotate(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextRotate());
-    assertNotNull(layer.getTextRotate().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextRotate().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextRotate().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextRotate().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextRotate());
+        assertNotNull(layer.getTextRotate().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextRotate().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextRotate().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextRotate().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1662,29 +2047,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textRotate(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, textRotate(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textRotate(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, textRotate(0.3f))
+              )
+            ).withDefaultValue(textRotate(0.3f))
           )
-        ).withDefaultValue(textRotate(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getTextRotate());
+        assertNotNull(layer.getTextRotate().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextRotate().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextRotate().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getTextRotate().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getTextRotate().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getTextRotate().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getTextRotate().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getTextRotate());
-    assertNotNull(layer.getTextRotate().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextRotate().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextRotate().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getTextRotate().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getTextRotate().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getTextRotate().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getTextRotate().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -1692,34 +2083,39 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textRotate(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, textRotate(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(textRotate(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getTextRotate());
-    assertNotNull(layer.getTextRotate().getFunction());
-    assertEquals(CompositeFunction.class, layer.getTextRotate().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextRotate().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextRotate().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getTextRotate().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextRotate().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textRotate(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, textRotate(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(textRotate(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getTextRotate());
+        assertNotNull(layer.getTextRotate().getFunction());
+        assertEquals(CompositeFunction.class, layer.getTextRotate().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextRotate().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextRotate().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getTextRotate().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextRotate().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -1727,11 +2123,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-padding");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textPadding(0.3f));
-    assertEquals((Float) layer.getTextPadding().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(textPadding(0.3f));
+        assertEquals((Float) layer.getTextPadding().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -1739,26 +2140,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-padding");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textPadding(
-        zoom(
-          exponential(
-            stop(2, textPadding(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textPadding(
+            zoom(
+              exponential(
+                stop(2, textPadding(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextPadding());
-    assertNotNull(layer.getTextPadding().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextPadding().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextPadding().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextPadding().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextPadding().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextPadding());
+        assertNotNull(layer.getTextPadding().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextPadding().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextPadding().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextPadding().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextPadding().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1766,11 +2172,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-keep-upright");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textKeepUpright(true));
-    assertEquals((Boolean) layer.getTextKeepUpright().getValue(), (Boolean) true);
+        // Set and Get
+        layer.setProperties(textKeepUpright(true));
+        assertEquals((Boolean) layer.getTextKeepUpright().getValue(), (Boolean) true);
+      }
+    });
   }
 
   @Test
@@ -1778,25 +2189,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-keep-upright");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textKeepUpright(
-        zoom(
-          interval(
-            stop(2, textKeepUpright(true))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textKeepUpright(
+            zoom(
+              interval(
+                stop(2, textKeepUpright(true))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextKeepUpright());
-    assertNotNull(layer.getTextKeepUpright().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextKeepUpright().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextKeepUpright().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextKeepUpright().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextKeepUpright());
+        assertNotNull(layer.getTextKeepUpright().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextKeepUpright().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextKeepUpright().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextKeepUpright().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1804,11 +2220,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-transform");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textTransform(TEXT_TRANSFORM_NONE));
-    assertEquals((String) layer.getTextTransform().getValue(), (String) TEXT_TRANSFORM_NONE);
+        // Set and Get
+        layer.setProperties(textTransform(TEXT_TRANSFORM_NONE));
+        assertEquals((String) layer.getTextTransform().getValue(), (String) TEXT_TRANSFORM_NONE);
+      }
+    });
   }
 
   @Test
@@ -1816,25 +2237,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-transform");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textTransform(
-        zoom(
-          interval(
-            stop(2, textTransform(TEXT_TRANSFORM_NONE))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textTransform(
+            zoom(
+              interval(
+                stop(2, textTransform(TEXT_TRANSFORM_NONE))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextTransform());
-    assertNotNull(layer.getTextTransform().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextTransform().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextTransform().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextTransform().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextTransform());
+        assertNotNull(layer.getTextTransform().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextTransform().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextTransform().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextTransform().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1842,19 +2268,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-transform");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      textTransform(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+        // Set
+        layer.setProperties(
+          textTransform(property("FeaturePropertyA", Stops.<String>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getTextTransform());
-    assertNotNull(layer.getTextTransform().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextTransform().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextTransform().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getTextTransform().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextTransform());
+        assertNotNull(layer.getTextTransform().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextTransform().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextTransform().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextTransform().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1862,26 +2293,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-transform");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textTransform(
-        property(
-          "FeaturePropertyA",
-          interval(
-            stop(1, textTransform(TEXT_TRANSFORM_NONE))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textTransform(
+            property(
+              "FeaturePropertyA",
+              interval(
+                stop(1, textTransform(TEXT_TRANSFORM_NONE))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextTransform());
-    assertNotNull(layer.getTextTransform().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextTransform().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextTransform().getFunction()).getProperty());
-    assertEquals(IntervalStops.class, layer.getTextTransform().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextTransform());
+        assertNotNull(layer.getTextTransform().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextTransform().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextTransform().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.getTextTransform().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1889,11 +2325,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-offset");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textOffset(new Float[]{0f,0f}));
-    assertEquals((Float[]) layer.getTextOffset().getValue(), (Float[]) new Float[]{0f,0f});
+        // Set and Get
+        layer.setProperties(textOffset(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getTextOffset().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
+    });
   }
 
   @Test
@@ -1901,26 +2342,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-offset");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textOffset(
-        zoom(
-          exponential(
-            stop(2, textOffset(new Float[]{0f,0f}))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textOffset(
+            zoom(
+              exponential(
+                stop(2, textOffset(new Float[] {0f, 0f}))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextOffset());
-    assertNotNull(layer.getTextOffset().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextOffset().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextOffset().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextOffset().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextOffset().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextOffset());
+        assertNotNull(layer.getTextOffset().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextOffset().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextOffset().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextOffset().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextOffset().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -1928,19 +2374,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-offset");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      textOffset(property("FeaturePropertyA", Stops.<Float[]>identity()))
-    );
+        // Set
+        layer.setProperties(
+          textOffset(property("FeaturePropertyA", Stops.<Float[]>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getTextOffset());
-    assertNotNull(layer.getTextOffset().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextOffset().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextOffset().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getTextOffset().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextOffset());
+        assertNotNull(layer.getTextOffset().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextOffset().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextOffset().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextOffset().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1948,26 +2399,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-offset");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textOffset(
-        property(
-          "FeaturePropertyA",
-          interval(
-            stop(1, textOffset(new Float[]{0f,0f}))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textOffset(
+            property(
+              "FeaturePropertyA",
+              interval(
+                stop(1, textOffset(new Float[] {0f, 0f}))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextOffset());
-    assertNotNull(layer.getTextOffset().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextOffset().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextOffset().getFunction()).getProperty());
-    assertEquals(IntervalStops.class, layer.getTextOffset().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextOffset());
+        assertNotNull(layer.getTextOffset().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextOffset().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextOffset().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.getTextOffset().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -1975,11 +2431,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-allow-overlap");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textAllowOverlap(true));
-    assertEquals((Boolean) layer.getTextAllowOverlap().getValue(), (Boolean) true);
+        // Set and Get
+        layer.setProperties(textAllowOverlap(true));
+        assertEquals((Boolean) layer.getTextAllowOverlap().getValue(), (Boolean) true);
+      }
+    });
   }
 
   @Test
@@ -1987,25 +2448,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-allow-overlap");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textAllowOverlap(
-        zoom(
-          interval(
-            stop(2, textAllowOverlap(true))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textAllowOverlap(
+            zoom(
+              interval(
+                stop(2, textAllowOverlap(true))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextAllowOverlap());
-    assertNotNull(layer.getTextAllowOverlap().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextAllowOverlap().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextAllowOverlap().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextAllowOverlap().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextAllowOverlap());
+        assertNotNull(layer.getTextAllowOverlap().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextAllowOverlap().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextAllowOverlap().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextAllowOverlap().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -2013,11 +2479,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-ignore-placement");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textIgnorePlacement(true));
-    assertEquals((Boolean) layer.getTextIgnorePlacement().getValue(), (Boolean) true);
+        // Set and Get
+        layer.setProperties(textIgnorePlacement(true));
+        assertEquals((Boolean) layer.getTextIgnorePlacement().getValue(), (Boolean) true);
+      }
+    });
   }
 
   @Test
@@ -2025,25 +2496,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-ignore-placement");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textIgnorePlacement(
-        zoom(
-          interval(
-            stop(2, textIgnorePlacement(true))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textIgnorePlacement(
+            zoom(
+              interval(
+                stop(2, textIgnorePlacement(true))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextIgnorePlacement());
-    assertNotNull(layer.getTextIgnorePlacement().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextIgnorePlacement().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextIgnorePlacement().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextIgnorePlacement().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextIgnorePlacement());
+        assertNotNull(layer.getTextIgnorePlacement().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextIgnorePlacement().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextIgnorePlacement().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextIgnorePlacement().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -2051,11 +2527,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-optional");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textOptional(true));
-    assertEquals((Boolean) layer.getTextOptional().getValue(), (Boolean) true);
+        // Set and Get
+        layer.setProperties(textOptional(true));
+        assertEquals((Boolean) layer.getTextOptional().getValue(), (Boolean) true);
+      }
+    });
   }
 
   @Test
@@ -2063,25 +2544,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-optional");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textOptional(
-        zoom(
-          interval(
-            stop(2, textOptional(true))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textOptional(
+            zoom(
+              interval(
+                stop(2, textOptional(true))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getTextOptional());
-    assertNotNull(layer.getTextOptional().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextOptional().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextOptional().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextOptional().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextOptional());
+        assertNotNull(layer.getTextOptional().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextOptional().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextOptional().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextOptional().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -2089,12 +2575,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacityTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setIconOpacityTransition(options);
-    assertEquals(layer.getIconOpacityTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setIconOpacityTransition(options);
+        assertEquals(layer.getIconOpacityTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -2102,11 +2593,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconOpacity(0.3f));
-    assertEquals((Float) layer.getIconOpacity().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(iconOpacity(0.3f));
+        assertEquals((Float) layer.getIconOpacity().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -2114,26 +2610,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconOpacity(
-        zoom(
-          exponential(
-            stop(2, iconOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconOpacity(
+            zoom(
+              exponential(
+                stop(2, iconOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconOpacity());
-    assertNotNull(layer.getIconOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconOpacity().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconOpacity());
+        assertNotNull(layer.getIconOpacity().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconOpacity().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconOpacity().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconOpacity().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconOpacity().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -2141,19 +2642,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      iconOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          iconOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getIconOpacity());
-    assertNotNull(layer.getIconOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconOpacity().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getIconOpacity().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconOpacity());
+        assertNotNull(layer.getIconOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconOpacity().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getIconOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -2161,26 +2667,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconOpacity(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, iconOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconOpacity(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, iconOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconOpacity());
-    assertNotNull(layer.getIconOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconOpacity().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconOpacity());
+        assertNotNull(layer.getIconOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -2188,29 +2699,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconOpacity(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, iconOpacity(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconOpacity(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, iconOpacity(0.3f))
+              )
+            ).withDefaultValue(iconOpacity(0.3f))
           )
-        ).withDefaultValue(iconOpacity(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getIconOpacity());
+        assertNotNull(layer.getIconOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconOpacity().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getIconOpacity().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getIconOpacity().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getIconOpacity().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getIconOpacity().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getIconOpacity());
-    assertNotNull(layer.getIconOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconOpacity().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getIconOpacity().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getIconOpacity().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getIconOpacity().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getIconOpacity().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -2218,34 +2735,39 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconOpacity(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, iconOpacity(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(iconOpacity(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getIconOpacity());
-    assertNotNull(layer.getIconOpacity().getFunction());
-    assertEquals(CompositeFunction.class, layer.getIconOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconOpacity().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getIconOpacity().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconOpacity().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconOpacity(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, iconOpacity(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(iconOpacity(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getIconOpacity());
+        assertNotNull(layer.getIconOpacity().getFunction());
+        assertEquals(CompositeFunction.class, layer.getIconOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconOpacity().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getIconOpacity().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconOpacity().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -2253,12 +2775,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-colorTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setIconColorTransition(options);
-    assertEquals(layer.getIconColorTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setIconColorTransition(options);
+        assertEquals(layer.getIconColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -2266,11 +2793,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getIconColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+        // Set and Get
+        layer.setProperties(iconColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getIconColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -2278,26 +2810,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconColor(
-        zoom(
-          exponential(
-            stop(2, iconColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconColor(
+            zoom(
+              exponential(
+                stop(2, iconColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconColor());
-    assertNotNull(layer.getIconColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconColor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconColor());
+        assertNotNull(layer.getIconColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -2305,19 +2842,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      iconColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+        // Set
+        layer.setProperties(
+          iconColor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getIconColor());
-    assertNotNull(layer.getIconColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getIconColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconColor());
+        assertNotNull(layer.getIconColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconColor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getIconColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -2325,26 +2867,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, iconColor(Color.RED))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconColor(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(Color.RED, iconColor(Color.RED))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconColor());
-    assertNotNull(layer.getIconColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconColor());
+        assertNotNull(layer.getIconColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconColor().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -2352,29 +2899,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", iconColor(Color.RED))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconColor(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop("valueA", iconColor(Color.RED))
+              )
+            ).withDefaultValue(iconColor(Color.GREEN))
           )
-        ).withDefaultValue(iconColor(Color.GREEN))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getIconColor());
+        assertNotNull(layer.getIconColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconColor().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getIconColor().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getIconColor().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getIconColor().getFunction()).getDefaultValue().getValue());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getIconColor().getFunction()).getDefaultValue().getColorInt());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getIconColor());
-    assertNotNull(layer.getIconColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getIconColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getIconColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getIconColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getIconColor().getFunction()).getDefaultValue().getColorInt());
   }
 
   @Test
@@ -2382,11 +2935,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconColor(Color.RED));
-    assertEquals(layer.getIconColorAsInt(), Color.RED);
+        // Set and Get
+        layer.setProperties(iconColor(Color.RED));
+        assertEquals(layer.getIconColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -2394,12 +2952,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-colorTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setIconHaloColorTransition(options);
-    assertEquals(layer.getIconHaloColorTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setIconHaloColorTransition(options);
+        assertEquals(layer.getIconHaloColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -2407,11 +2970,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconHaloColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getIconHaloColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+        // Set and Get
+        layer.setProperties(iconHaloColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getIconHaloColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -2419,26 +2987,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloColor(
-        zoom(
-          exponential(
-            stop(2, iconHaloColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloColor(
+            zoom(
+              exponential(
+                stop(2, iconHaloColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconHaloColor());
-    assertNotNull(layer.getIconHaloColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconHaloColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconHaloColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconHaloColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconHaloColor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconHaloColor());
+        assertNotNull(layer.getIconHaloColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconHaloColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconHaloColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconHaloColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconHaloColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -2446,19 +3019,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      iconHaloColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+        // Set
+        layer.setProperties(
+          iconHaloColor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getIconHaloColor());
-    assertNotNull(layer.getIconHaloColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconHaloColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getIconHaloColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconHaloColor());
+        assertNotNull(layer.getIconHaloColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconHaloColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloColor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getIconHaloColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -2466,26 +3044,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, iconHaloColor(Color.RED))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloColor(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(Color.RED, iconHaloColor(Color.RED))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconHaloColor());
-    assertNotNull(layer.getIconHaloColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconHaloColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconHaloColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconHaloColor());
+        assertNotNull(layer.getIconHaloColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconHaloColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloColor().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconHaloColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -2493,29 +3076,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", iconHaloColor(Color.RED))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloColor(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop("valueA", iconHaloColor(Color.RED))
+              )
+            ).withDefaultValue(iconHaloColor(Color.GREEN))
           )
-        ).withDefaultValue(iconHaloColor(Color.GREEN))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getIconHaloColor());
+        assertNotNull(layer.getIconHaloColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconHaloColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloColor().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getIconHaloColor().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getIconHaloColor().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getIconHaloColor().getFunction()).getDefaultValue().getValue());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getIconHaloColor().getFunction()).getDefaultValue().getColorInt());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getIconHaloColor());
-    assertNotNull(layer.getIconHaloColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconHaloColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getIconHaloColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getIconHaloColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getIconHaloColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getIconHaloColor().getFunction()).getDefaultValue().getColorInt());
   }
 
   @Test
@@ -2523,11 +3112,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconHaloColor(Color.RED));
-    assertEquals(layer.getIconHaloColorAsInt(), Color.RED);
+        // Set and Get
+        layer.setProperties(iconHaloColor(Color.RED));
+        assertEquals(layer.getIconHaloColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -2535,12 +3129,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-widthTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setIconHaloWidthTransition(options);
-    assertEquals(layer.getIconHaloWidthTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setIconHaloWidthTransition(options);
+        assertEquals(layer.getIconHaloWidthTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -2548,11 +3147,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconHaloWidth(0.3f));
-    assertEquals((Float) layer.getIconHaloWidth().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(iconHaloWidth(0.3f));
+        assertEquals((Float) layer.getIconHaloWidth().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -2560,26 +3164,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloWidth(
-        zoom(
-          exponential(
-            stop(2, iconHaloWidth(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloWidth(
+            zoom(
+              exponential(
+                stop(2, iconHaloWidth(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconHaloWidth());
-    assertNotNull(layer.getIconHaloWidth().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconHaloWidth().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconHaloWidth().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconHaloWidth().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconHaloWidth().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconHaloWidth());
+        assertNotNull(layer.getIconHaloWidth().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconHaloWidth().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconHaloWidth().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconHaloWidth().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconHaloWidth().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -2587,19 +3196,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      iconHaloWidth(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          iconHaloWidth(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getIconHaloWidth());
-    assertNotNull(layer.getIconHaloWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconHaloWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloWidth().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getIconHaloWidth().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconHaloWidth());
+        assertNotNull(layer.getIconHaloWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconHaloWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloWidth().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getIconHaloWidth().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -2607,26 +3221,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloWidth(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, iconHaloWidth(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloWidth(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, iconHaloWidth(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconHaloWidth());
-    assertNotNull(layer.getIconHaloWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconHaloWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloWidth().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconHaloWidth().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconHaloWidth());
+        assertNotNull(layer.getIconHaloWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconHaloWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconHaloWidth().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -2634,29 +3253,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloWidth(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, iconHaloWidth(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloWidth(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, iconHaloWidth(0.3f))
+              )
+            ).withDefaultValue(iconHaloWidth(0.3f))
           )
-        ).withDefaultValue(iconHaloWidth(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getIconHaloWidth());
+        assertNotNull(layer.getIconHaloWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconHaloWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloWidth().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getIconHaloWidth().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getIconHaloWidth().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getIconHaloWidth().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getIconHaloWidth().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getIconHaloWidth());
-    assertNotNull(layer.getIconHaloWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconHaloWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloWidth().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getIconHaloWidth().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getIconHaloWidth().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getIconHaloWidth().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getIconHaloWidth().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -2664,34 +3289,39 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloWidth(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, iconHaloWidth(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(iconHaloWidth(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getIconHaloWidth());
-    assertNotNull(layer.getIconHaloWidth().getFunction());
-    assertEquals(CompositeFunction.class, layer.getIconHaloWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconHaloWidth().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconHaloWidth().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getIconHaloWidth().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconHaloWidth().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloWidth(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, iconHaloWidth(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(iconHaloWidth(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getIconHaloWidth());
+        assertNotNull(layer.getIconHaloWidth().getFunction());
+        assertEquals(CompositeFunction.class, layer.getIconHaloWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconHaloWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconHaloWidth().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getIconHaloWidth().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconHaloWidth().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -2699,12 +3329,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blurTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setIconHaloBlurTransition(options);
-    assertEquals(layer.getIconHaloBlurTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setIconHaloBlurTransition(options);
+        assertEquals(layer.getIconHaloBlurTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -2712,11 +3347,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconHaloBlur(0.3f));
-    assertEquals((Float) layer.getIconHaloBlur().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(iconHaloBlur(0.3f));
+        assertEquals((Float) layer.getIconHaloBlur().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -2724,26 +3364,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloBlur(
-        zoom(
-          exponential(
-            stop(2, iconHaloBlur(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloBlur(
+            zoom(
+              exponential(
+                stop(2, iconHaloBlur(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconHaloBlur());
-    assertNotNull(layer.getIconHaloBlur().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconHaloBlur().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconHaloBlur().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconHaloBlur().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconHaloBlur().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconHaloBlur());
+        assertNotNull(layer.getIconHaloBlur().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconHaloBlur().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconHaloBlur().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconHaloBlur().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconHaloBlur().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -2751,19 +3396,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      iconHaloBlur(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          iconHaloBlur(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getIconHaloBlur());
-    assertNotNull(layer.getIconHaloBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconHaloBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloBlur().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getIconHaloBlur().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconHaloBlur());
+        assertNotNull(layer.getIconHaloBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconHaloBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloBlur().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getIconHaloBlur().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -2771,26 +3421,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloBlur(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, iconHaloBlur(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloBlur(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, iconHaloBlur(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconHaloBlur());
-    assertNotNull(layer.getIconHaloBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconHaloBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloBlur().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconHaloBlur().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getIconHaloBlur());
+        assertNotNull(layer.getIconHaloBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconHaloBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloBlur().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconHaloBlur().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -2798,29 +3453,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloBlur(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, iconHaloBlur(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloBlur(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, iconHaloBlur(0.3f))
+              )
+            ).withDefaultValue(iconHaloBlur(0.3f))
           )
-        ).withDefaultValue(iconHaloBlur(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getIconHaloBlur());
+        assertNotNull(layer.getIconHaloBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconHaloBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloBlur().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getIconHaloBlur().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getIconHaloBlur().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getIconHaloBlur().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getIconHaloBlur().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getIconHaloBlur());
-    assertNotNull(layer.getIconHaloBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getIconHaloBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconHaloBlur().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getIconHaloBlur().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getIconHaloBlur().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getIconHaloBlur().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getIconHaloBlur().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -2828,34 +3489,39 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconHaloBlur(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, iconHaloBlur(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(iconHaloBlur(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getIconHaloBlur());
-    assertNotNull(layer.getIconHaloBlur().getFunction());
-    assertEquals(CompositeFunction.class, layer.getIconHaloBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconHaloBlur().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getIconHaloBlur().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getIconHaloBlur().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconHaloBlur().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconHaloBlur(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, iconHaloBlur(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(iconHaloBlur(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getIconHaloBlur());
+        assertNotNull(layer.getIconHaloBlur().getFunction());
+        assertEquals(CompositeFunction.class, layer.getIconHaloBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getIconHaloBlur().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getIconHaloBlur().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getIconHaloBlur().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getIconHaloBlur().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -2863,12 +3529,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-translateTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setIconTranslateTransition(options);
-    assertEquals(layer.getIconTranslateTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setIconTranslateTransition(options);
+        assertEquals(layer.getIconTranslateTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -2876,11 +3547,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-translate");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconTranslate(new Float[]{0f,0f}));
-    assertEquals((Float[]) layer.getIconTranslate().getValue(), (Float[]) new Float[]{0f,0f});
+        // Set and Get
+        layer.setProperties(iconTranslate(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getIconTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
+    });
   }
 
   @Test
@@ -2888,26 +3564,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-translate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconTranslate(
-        zoom(
-          exponential(
-            stop(2, iconTranslate(new Float[]{0f,0f}))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconTranslate(
+            zoom(
+              exponential(
+                stop(2, iconTranslate(new Float[] {0f, 0f}))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getIconTranslate());
-    assertNotNull(layer.getIconTranslate().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconTranslate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getIconTranslate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getIconTranslate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getIconTranslate().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconTranslate());
+        assertNotNull(layer.getIconTranslate().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconTranslate().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getIconTranslate().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getIconTranslate().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getIconTranslate().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -2915,11 +3596,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-translate-anchor");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(iconTranslateAnchor(ICON_TRANSLATE_ANCHOR_MAP));
-    assertEquals((String) layer.getIconTranslateAnchor().getValue(), (String) ICON_TRANSLATE_ANCHOR_MAP);
+        // Set and Get
+        layer.setProperties(iconTranslateAnchor(ICON_TRANSLATE_ANCHOR_MAP));
+        assertEquals((String) layer.getIconTranslateAnchor().getValue(), (String) ICON_TRANSLATE_ANCHOR_MAP);
+      }
+    });
   }
 
   @Test
@@ -2927,25 +3613,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-translate-anchor");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      iconTranslateAnchor(
-        zoom(
-          interval(
-            stop(2, iconTranslateAnchor(ICON_TRANSLATE_ANCHOR_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconTranslateAnchor(
+            zoom(
+              interval(
+                stop(2, iconTranslateAnchor(ICON_TRANSLATE_ANCHOR_MAP))
+              )
+            )
           )
-        )
-      )
-    );
+        );
 
-    // Verify
-    assertNotNull(layer.getIconTranslateAnchor());
-    assertNotNull(layer.getIconTranslateAnchor().getFunction());
-    assertEquals(CameraFunction.class, layer.getIconTranslateAnchor().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getIconTranslateAnchor().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getIconTranslateAnchor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getIconTranslateAnchor());
+        assertNotNull(layer.getIconTranslateAnchor().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconTranslateAnchor().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getIconTranslateAnchor().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getIconTranslateAnchor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -2953,12 +3644,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacityTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setTextOpacityTransition(options);
-    assertEquals(layer.getTextOpacityTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setTextOpacityTransition(options);
+        assertEquals(layer.getTextOpacityTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -2966,11 +3662,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textOpacity(0.3f));
-    assertEquals((Float) layer.getTextOpacity().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(textOpacity(0.3f));
+        assertEquals((Float) layer.getTextOpacity().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -2978,26 +3679,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textOpacity(
-        zoom(
-          exponential(
-            stop(2, textOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textOpacity(
+            zoom(
+              exponential(
+                stop(2, textOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextOpacity());
-    assertNotNull(layer.getTextOpacity().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextOpacity().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextOpacity().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextOpacity().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextOpacity().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextOpacity());
+        assertNotNull(layer.getTextOpacity().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextOpacity().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextOpacity().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextOpacity().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextOpacity().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -3005,19 +3711,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      textOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          textOpacity(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getTextOpacity());
-    assertNotNull(layer.getTextOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextOpacity().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getTextOpacity().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextOpacity());
+        assertNotNull(layer.getTextOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextOpacity().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -3025,26 +3736,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textOpacity(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, textOpacity(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textOpacity(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, textOpacity(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextOpacity());
-    assertNotNull(layer.getTextOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextOpacity().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextOpacity());
+        assertNotNull(layer.getTextOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextOpacity().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -3052,29 +3768,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textOpacity(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, textOpacity(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textOpacity(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, textOpacity(0.3f))
+              )
+            ).withDefaultValue(textOpacity(0.3f))
           )
-        ).withDefaultValue(textOpacity(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getTextOpacity());
+        assertNotNull(layer.getTextOpacity().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextOpacity().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getTextOpacity().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getTextOpacity().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getTextOpacity().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getTextOpacity().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getTextOpacity());
-    assertNotNull(layer.getTextOpacity().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextOpacity().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getTextOpacity().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getTextOpacity().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getTextOpacity().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getTextOpacity().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -3082,34 +3804,39 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textOpacity(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, textOpacity(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(textOpacity(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getTextOpacity());
-    assertNotNull(layer.getTextOpacity().getFunction());
-    assertEquals(CompositeFunction.class, layer.getTextOpacity().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextOpacity().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextOpacity().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getTextOpacity().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextOpacity().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textOpacity(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, textOpacity(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(textOpacity(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getTextOpacity());
+        assertNotNull(layer.getTextOpacity().getFunction());
+        assertEquals(CompositeFunction.class, layer.getTextOpacity().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextOpacity().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextOpacity().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getTextOpacity().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextOpacity().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -3117,12 +3844,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-colorTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setTextColorTransition(options);
-    assertEquals(layer.getTextColorTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setTextColorTransition(options);
+        assertEquals(layer.getTextColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -3130,11 +3862,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getTextColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+        // Set and Get
+        layer.setProperties(textColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getTextColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -3142,26 +3879,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textColor(
-        zoom(
-          exponential(
-            stop(2, textColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textColor(
+            zoom(
+              exponential(
+                stop(2, textColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextColor());
-    assertNotNull(layer.getTextColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextColor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextColor());
+        assertNotNull(layer.getTextColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -3169,19 +3911,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      textColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+        // Set
+        layer.setProperties(
+          textColor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getTextColor());
-    assertNotNull(layer.getTextColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getTextColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextColor());
+        assertNotNull(layer.getTextColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextColor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -3189,26 +3936,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, textColor(Color.RED))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textColor(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(Color.RED, textColor(Color.RED))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextColor());
-    assertNotNull(layer.getTextColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextColor());
+        assertNotNull(layer.getTextColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextColor().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -3216,29 +3968,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", textColor(Color.RED))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textColor(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop("valueA", textColor(Color.RED))
+              )
+            ).withDefaultValue(textColor(Color.GREEN))
           )
-        ).withDefaultValue(textColor(Color.GREEN))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getTextColor());
+        assertNotNull(layer.getTextColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextColor().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getTextColor().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getTextColor().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getTextColor().getFunction()).getDefaultValue().getValue());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getTextColor().getFunction()).getDefaultValue().getColorInt());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getTextColor());
-    assertNotNull(layer.getTextColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getTextColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getTextColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getTextColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getTextColor().getFunction()).getDefaultValue().getColorInt());
   }
 
   @Test
@@ -3246,11 +4004,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textColor(Color.RED));
-    assertEquals(layer.getTextColorAsInt(), Color.RED);
+        // Set and Get
+        layer.setProperties(textColor(Color.RED));
+        assertEquals(layer.getTextColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -3258,12 +4021,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-colorTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setTextHaloColorTransition(options);
-    assertEquals(layer.getTextHaloColorTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setTextHaloColorTransition(options);
+        assertEquals(layer.getTextHaloColorTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -3271,11 +4039,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textHaloColor("rgba(0, 0, 0, 1)"));
-    assertEquals((String) layer.getTextHaloColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+        // Set and Get
+        layer.setProperties(textHaloColor("rgba(0, 0, 0, 1)"));
+        assertEquals((String) layer.getTextHaloColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      }
+    });
   }
 
   @Test
@@ -3283,26 +4056,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloColor(
-        zoom(
-          exponential(
-            stop(2, textHaloColor("rgba(0, 0, 0, 1)"))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloColor(
+            zoom(
+              exponential(
+                stop(2, textHaloColor("rgba(0, 0, 0, 1)"))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextHaloColor());
-    assertNotNull(layer.getTextHaloColor().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextHaloColor().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextHaloColor().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextHaloColor().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextHaloColor().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextHaloColor());
+        assertNotNull(layer.getTextHaloColor().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextHaloColor().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextHaloColor().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextHaloColor().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextHaloColor().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -3310,19 +4088,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      textHaloColor(property("FeaturePropertyA", Stops.<String>identity()))
-    );
+        // Set
+        layer.setProperties(
+          textHaloColor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getTextHaloColor());
-    assertNotNull(layer.getTextHaloColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextHaloColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloColor().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getTextHaloColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextHaloColor());
+        assertNotNull(layer.getTextHaloColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextHaloColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloColor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextHaloColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -3330,26 +4113,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloColor(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(Color.RED, textHaloColor(Color.RED))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloColor(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(Color.RED, textHaloColor(Color.RED))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextHaloColor());
-    assertNotNull(layer.getTextHaloColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextHaloColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloColor().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextHaloColor().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextHaloColor());
+        assertNotNull(layer.getTextHaloColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextHaloColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloColor().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextHaloColor().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -3357,29 +4145,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloColor(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop("valueA", textHaloColor(Color.RED))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloColor(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop("valueA", textHaloColor(Color.RED))
+              )
+            ).withDefaultValue(textHaloColor(Color.GREEN))
           )
-        ).withDefaultValue(textHaloColor(Color.GREEN))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getTextHaloColor());
+        assertNotNull(layer.getTextHaloColor().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextHaloColor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloColor().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getTextHaloColor().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getTextHaloColor().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getTextHaloColor().getFunction()).getDefaultValue().getValue());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getTextHaloColor().getFunction()).getDefaultValue().getColorInt());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getTextHaloColor());
-    assertNotNull(layer.getTextHaloColor().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextHaloColor().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloColor().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getTextHaloColor().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getTextHaloColor().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getTextHaloColor().getFunction()).getDefaultValue().getValue());
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.getTextHaloColor().getFunction()).getDefaultValue().getColorInt());
   }
 
   @Test
@@ -3387,11 +4181,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textHaloColor(Color.RED));
-    assertEquals(layer.getTextHaloColorAsInt(), Color.RED);
+        // Set and Get
+        layer.setProperties(textHaloColor(Color.RED));
+        assertEquals(layer.getTextHaloColorAsInt(), Color.RED);
+      }
+    });
   }
 
   @Test
@@ -3399,12 +4198,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-widthTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setTextHaloWidthTransition(options);
-    assertEquals(layer.getTextHaloWidthTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setTextHaloWidthTransition(options);
+        assertEquals(layer.getTextHaloWidthTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -3412,11 +4216,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textHaloWidth(0.3f));
-    assertEquals((Float) layer.getTextHaloWidth().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(textHaloWidth(0.3f));
+        assertEquals((Float) layer.getTextHaloWidth().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -3424,26 +4233,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloWidth(
-        zoom(
-          exponential(
-            stop(2, textHaloWidth(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloWidth(
+            zoom(
+              exponential(
+                stop(2, textHaloWidth(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextHaloWidth());
-    assertNotNull(layer.getTextHaloWidth().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextHaloWidth().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextHaloWidth().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextHaloWidth().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextHaloWidth().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextHaloWidth());
+        assertNotNull(layer.getTextHaloWidth().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextHaloWidth().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextHaloWidth().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextHaloWidth().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextHaloWidth().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -3451,19 +4265,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      textHaloWidth(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          textHaloWidth(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getTextHaloWidth());
-    assertNotNull(layer.getTextHaloWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextHaloWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloWidth().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getTextHaloWidth().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextHaloWidth());
+        assertNotNull(layer.getTextHaloWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextHaloWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloWidth().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextHaloWidth().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -3471,26 +4290,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloWidth(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, textHaloWidth(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloWidth(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, textHaloWidth(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextHaloWidth());
-    assertNotNull(layer.getTextHaloWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextHaloWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloWidth().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextHaloWidth().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextHaloWidth());
+        assertNotNull(layer.getTextHaloWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextHaloWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextHaloWidth().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -3498,29 +4322,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloWidth(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, textHaloWidth(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloWidth(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, textHaloWidth(0.3f))
+              )
+            ).withDefaultValue(textHaloWidth(0.3f))
           )
-        ).withDefaultValue(textHaloWidth(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getTextHaloWidth());
+        assertNotNull(layer.getTextHaloWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextHaloWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloWidth().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getTextHaloWidth().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getTextHaloWidth().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getTextHaloWidth().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getTextHaloWidth().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getTextHaloWidth());
-    assertNotNull(layer.getTextHaloWidth().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextHaloWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloWidth().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getTextHaloWidth().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getTextHaloWidth().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getTextHaloWidth().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getTextHaloWidth().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -3528,34 +4358,39 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloWidth(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, textHaloWidth(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(textHaloWidth(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getTextHaloWidth());
-    assertNotNull(layer.getTextHaloWidth().getFunction());
-    assertEquals(CompositeFunction.class, layer.getTextHaloWidth().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextHaloWidth().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextHaloWidth().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getTextHaloWidth().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextHaloWidth().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloWidth(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, textHaloWidth(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(textHaloWidth(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getTextHaloWidth());
+        assertNotNull(layer.getTextHaloWidth().getFunction());
+        assertEquals(CompositeFunction.class, layer.getTextHaloWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextHaloWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextHaloWidth().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getTextHaloWidth().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextHaloWidth().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -3563,12 +4398,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blurTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setTextHaloBlurTransition(options);
-    assertEquals(layer.getTextHaloBlurTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setTextHaloBlurTransition(options);
+        assertEquals(layer.getTextHaloBlurTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -3576,11 +4416,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textHaloBlur(0.3f));
-    assertEquals((Float) layer.getTextHaloBlur().getValue(), (Float) 0.3f);
+        // Set and Get
+        layer.setProperties(textHaloBlur(0.3f));
+        assertEquals((Float) layer.getTextHaloBlur().getValue(), (Float) 0.3f);
+      }
+    });
   }
 
   @Test
@@ -3588,26 +4433,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloBlur(
-        zoom(
-          exponential(
-            stop(2, textHaloBlur(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloBlur(
+            zoom(
+              exponential(
+                stop(2, textHaloBlur(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextHaloBlur());
-    assertNotNull(layer.getTextHaloBlur().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextHaloBlur().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextHaloBlur().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextHaloBlur().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextHaloBlur().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextHaloBlur());
+        assertNotNull(layer.getTextHaloBlur().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextHaloBlur().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextHaloBlur().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextHaloBlur().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextHaloBlur().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -3615,19 +4465,24 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set
-    layer.setProperties(
-      textHaloBlur(property("FeaturePropertyA", Stops.<Float>identity()))
-    );
+        // Set
+        layer.setProperties(
+          textHaloBlur(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
 
-    // Verify
-    assertNotNull(layer.getTextHaloBlur());
-    assertNotNull(layer.getTextHaloBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextHaloBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloBlur().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.getTextHaloBlur().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextHaloBlur());
+        assertNotNull(layer.getTextHaloBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextHaloBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloBlur().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextHaloBlur().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -3635,26 +4490,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloBlur(
-        property(
-          "FeaturePropertyA",
-          exponential(
-            stop(0.3f, textHaloBlur(0.3f))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloBlur(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, textHaloBlur(0.3f))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextHaloBlur());
-    assertNotNull(layer.getTextHaloBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextHaloBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloBlur().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextHaloBlur().getFunction().getStops().getClass());
+        // Verify
+        assertNotNull(layer.getTextHaloBlur());
+        assertNotNull(layer.getTextHaloBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextHaloBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloBlur().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextHaloBlur().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -3662,29 +4522,35 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloBlur(
-        property(
-          "FeaturePropertyA",
-          categorical(
-            stop(1.0f, textHaloBlur(0.3f))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloBlur(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, textHaloBlur(0.3f))
+              )
+            ).withDefaultValue(textHaloBlur(0.3f))
           )
-        ).withDefaultValue(textHaloBlur(0.3f))
-      )
-    );
+        );
+
+        // Verify
+        assertNotNull(layer.getTextHaloBlur());
+        assertNotNull(layer.getTextHaloBlur().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextHaloBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloBlur().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getTextHaloBlur().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getTextHaloBlur().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getTextHaloBlur().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getTextHaloBlur().getFunction()).getDefaultValue().getValue());
+      }
+    });
 
-    // Verify
-    assertNotNull(layer.getTextHaloBlur());
-    assertNotNull(layer.getTextHaloBlur().getFunction());
-    assertEquals(SourceFunction.class, layer.getTextHaloBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextHaloBlur().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.getTextHaloBlur().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.getTextHaloBlur().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.getTextHaloBlur().getFunction()).getDefaultValue().getValue());
-    assertEquals(0.3f, ((SourceFunction) layer.getTextHaloBlur().getFunction()).getDefaultValue().getValue());
   }
 
   @Test
@@ -3692,34 +4558,39 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textHaloBlur(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, textHaloBlur(0.9f))
-          ).withBase(0.5f)
-        ).withDefaultValue(textHaloBlur(0.3f))
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getTextHaloBlur());
-    assertNotNull(layer.getTextHaloBlur().getFunction());
-    assertEquals(CompositeFunction.class, layer.getTextHaloBlur().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextHaloBlur().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.getTextHaloBlur().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.getTextHaloBlur().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextHaloBlur().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textHaloBlur(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, textHaloBlur(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(textHaloBlur(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getTextHaloBlur());
+        assertNotNull(layer.getTextHaloBlur().getFunction());
+        assertEquals(CompositeFunction.class, layer.getTextHaloBlur().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextHaloBlur().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextHaloBlur().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getTextHaloBlur().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextHaloBlur().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 
   @Test
@@ -3727,12 +4598,17 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-translateTransitionOptions");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.setTextTranslateTransition(options);
-    assertEquals(layer.getTextTranslateTransition(), options);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.setTextTranslateTransition(options);
+        assertEquals(layer.getTextTranslateTransition(), options);
+      }
+    });
   }
 
   @Test
@@ -3740,11 +4616,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-translate");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textTranslate(new Float[]{0f,0f}));
-    assertEquals((Float[]) layer.getTextTranslate().getValue(), (Float[]) new Float[]{0f,0f});
+        // Set and Get
+        layer.setProperties(textTranslate(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getTextTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
+    });
   }
 
   @Test
@@ -3752,26 +4633,31 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-translate");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textTranslate(
-        zoom(
-          exponential(
-            stop(2, textTranslate(new Float[]{0f,0f}))
-          ).withBase(0.5f)
-        )
-      )
-    );
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textTranslate(
+            zoom(
+              exponential(
+                stop(2, textTranslate(new Float[] {0f, 0f}))
+              ).withBase(0.5f)
+            )
+          )
+        );
 
-    // Verify
-    assertNotNull(layer.getTextTranslate());
-    assertNotNull(layer.getTextTranslate().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextTranslate().getFunction().getClass());
-    assertEquals(ExponentialStops.class, layer.getTextTranslate().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.getTextTranslate().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.getTextTranslate().getFunction().getStops()).size());
+        // Verify
+        assertNotNull(layer.getTextTranslate());
+        assertNotNull(layer.getTextTranslate().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextTranslate().getFunction().getClass());
+        assertEquals(ExponentialStops.class, layer.getTextTranslate().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.getTextTranslate().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.getTextTranslate().getFunction().getStops()).size());
+      }
+    });
   }
 
   @Test
@@ -3779,11 +4665,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-translate-anchor");
-    assertNotNull(layer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
 
-    // Set and Get
-    layer.setProperties(textTranslateAnchor(TEXT_TRANSLATE_ANCHOR_MAP));
-    assertEquals((String) layer.getTextTranslateAnchor().getValue(), (String) TEXT_TRANSLATE_ANCHOR_MAP);
+        // Set and Get
+        layer.setProperties(textTranslateAnchor(TEXT_TRANSLATE_ANCHOR_MAP));
+        assertEquals((String) layer.getTextTranslateAnchor().getValue(), (String) TEXT_TRANSLATE_ANCHOR_MAP);
+      }
+    });
   }
 
   @Test
@@ -3791,25 +4682,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-translate-anchor");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      textTranslateAnchor(
-        zoom(
-          interval(
-            stop(2, textTranslateAnchor(TEXT_TRANSLATE_ANCHOR_MAP))
-          )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.getTextTranslateAnchor());
-    assertNotNull(layer.getTextTranslateAnchor().getFunction());
-    assertEquals(CameraFunction.class, layer.getTextTranslateAnchor().getFunction().getClass());
-    assertEquals(IntervalStops.class, layer.getTextTranslateAnchor().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.getTextTranslateAnchor().getFunction().getStops()).size());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textTranslateAnchor(
+            zoom(
+              interval(
+                stop(2, textTranslateAnchor(TEXT_TRANSLATE_ANCHOR_MAP))
+              )
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getTextTranslateAnchor());
+        assertNotNull(layer.getTextTranslateAnchor().getFunction());
+        assertEquals(CameraFunction.class, layer.getTextTranslateAnchor().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getTextTranslateAnchor().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getTextTranslateAnchor().getFunction().getStops()).size());
+      }
+    });
   }
 
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
index 02aedadfa5..192740f708 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
@@ -7,9 +7,9 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
-import android.support.test.espresso.Espresso;
-import android.support.test.rule.ActivityTestRule;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
+
 import timber.log.Timber;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -23,20 +23,16 @@ import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.Stop;
 import com.mapbox.mapboxsdk.style.functions.stops.Stops;
 import com.mapbox.mapboxsdk.style.layers.<%- camelize(type) %>Layer;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static com.mapbox.mapboxsdk.style.functions.Function.*;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
 import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
@@ -57,19 +53,30 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     return EspressoTestActivity.class;
   }
 
-  private void setupLayer(){
+  private void setupLayer() {
 <% if (type === 'background') { -%>
     Timber.i("Retrieving layer");
-    layer = mapboxMap.getLayerAs("background");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        layer = mapboxMap.getLayerAs("background");
+      }
+    });
 <% } else { -%>
-    if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-      Timber.i("Adding layer");
-      layer = new <%- camelize(type) %>Layer("my-layer", "composite");
-      layer.setSourceLayer("composite");
-      mapboxMap.addLayer(layer);
-      // Layer reference is now stale, get new reference
-      layer = mapboxMap.getLayerAs("my-layer");
-    }
+    Timber.i("Retrieving layer");
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
+          Timber.i("Adding layer");
+          layer = new <%- camelize(type) %>Layer("my-layer", "composite");
+          layer.setSourceLayer("composite");
+          mapboxMap.addLayer(layer);
+          // Layer reference is now stale, get new reference
+          layer = mapboxMap.getLayerAs("my-layer");
+        }
+      }
+    });
 <% } -%>
   }
 
@@ -78,14 +85,19 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    assertNotNull(layer);
-
-    // Get initial
-    assertEquals(layer.getVisibility().getValue(), VISIBLE);
-
-    // Set
-    layer.setProperties(visibility(NONE));
-    assertEquals(layer.getVisibility().getValue(), NONE);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Get initial
+        assertEquals(layer.getVisibility().getValue(), VISIBLE);
+
+        // Set
+        layer.setProperties(visibility(NONE));
+        assertEquals(layer.getVisibility().getValue(), NONE);
+      }
+    });
   }
 <% if (!(type === 'background' || type === 'raster')) { -%>
 
@@ -94,15 +106,20 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    assertNotNull(layer);
-
-    // Get initial
-    assertEquals(layer.getSourceLayer(), "composite");
-
-    // Set
-    final String sourceLayer = "test";
-    layer.setSourceLayer(sourceLayer);
-    assertEquals(layer.getSourceLayer(), sourceLayer);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Get initial
+        assertEquals(layer.getSourceLayer(), "composite");
+
+        // Set
+        final String sourceLayer = "test";
+        layer.setSourceLayer(sourceLayer);
+        assertEquals(layer.getSourceLayer(), sourceLayer);
+      }
+    });
   }
 <% } -%>
 <% for (const property of properties) { -%>
@@ -113,12 +130,17 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("<%- property.name %>TransitionOptions");
-    assertNotNull(layer);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    layer.set<%- camelize(property.name) %>Transition(options);
-    assertEquals(layer.get<%- camelize(property.name) %>Transition(), options);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        layer.set<%- camelize(property.name) %>Transition(options);
+        assertEquals(layer.get<%- camelize(property.name) %>Transition(), options);
+      }
+    });
   }
 <% } -%>
 
@@ -127,11 +149,16 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("<%- property.name %>");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>));
-    assertEquals((<%- propertyType(property) %>) layer.get<%- camelize(property.name) %>().getValue(), (<%- propertyType(property) %>) <%- defaultValueJava(property) %>);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>));
+        assertEquals((<%- propertyType(property) %>) layer.get<%- camelize(property.name) %>().getValue(), (<%- propertyType(property) %>) <%- defaultValueJava(property) %>);
+      }
+    });
   }
 <% if (supportsZoomFunction(property)) { -%>
 
@@ -140,37 +167,42 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("<%- property.name %>");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      <%- camelizeWithLeadingLowercase(property.name) %>(
-        zoom(
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          <%- camelizeWithLeadingLowercase(property.name) %>(
+            zoom(
 <% if (property.function == 'piecewise-constant') { -%>
-          interval(
-            stop(2, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
-          )
+              interval(
+                stop(2, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
+              )
 <% } else { -%>
-          exponential(
-            stop(2, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
-          ).withBase(0.5f)
+              exponential(
+                stop(2, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
+              ).withBase(0.5f)
 <% } -%>
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.get<%- camelize(property.name) %>());
-    assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
-    assertEquals(CameraFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.get<%- camelize(property.name) %>());
+        assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
+        assertEquals(CameraFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
 <% if (property.function == 'piecewise-constant') { -%>
-    assertEquals(IntervalStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
-    assertEquals(1, ((IntervalStops) layer.get<%- camelize(property.name) %>().getFunction().getStops()).size());
+        assertEquals(IntervalStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.get<%- camelize(property.name) %>().getFunction().getStops()).size());
 <% } else { -%>
-    assertEquals(ExponentialStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
-    assertEquals(0.5f, ((ExponentialStops) layer.get<%- camelize(property.name) %>().getFunction().getStops()).getBase(), 0.001);
-    assertEquals(1, ((ExponentialStops) layer.get<%- camelize(property.name) %>().getFunction().getStops()).size());
+        assertEquals(ExponentialStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+        assertEquals(0.5f, ((ExponentialStops) layer.get<%- camelize(property.name) %>().getFunction().getStops()).getBase(), 0.001);
+        assertEquals(1, ((ExponentialStops) layer.get<%- camelize(property.name) %>().getFunction().getStops()).size());
 <% } -%>
+      }
+    });
   }
 <% } -%>
 <% if (supportsPropertyFunction(property)) { -%>
@@ -180,19 +212,24 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("<%- property.name %>");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      <%- camelizeWithLeadingLowercase(property.name) %>(property("FeaturePropertyA", Stops.<<%- propertyType(property) %>>identity()))
-    );
-
-    // Verify
-    assertNotNull(layer.get<%- camelize(property.name) %>());
-    assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
-    assertEquals(SourceFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
-    assertEquals(IdentityStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          <%- camelizeWithLeadingLowercase(property.name) %>(property("FeaturePropertyA", Stops.<<%- propertyType(property) %>>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.get<%- camelize(property.name) %>());
+        assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
+        assertEquals(SourceFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+      }
+    });
   }
 <% if (property.function == 'piecewise-constant') { -%>
 
@@ -201,30 +238,35 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("<%- property.name %>");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      <%- camelizeWithLeadingLowercase(property.name) %>(
-        property(
-          "FeaturePropertyA",
-          interval(
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          <%- camelizeWithLeadingLowercase(property.name) %>(
+            property(
+              "FeaturePropertyA",
+              interval(
 <% if (property.type == 'color') { -%>
-            stop(Color.RED, <%- camelizeWithLeadingLowercase(property.name) %>(Color.RED))
+                stop(Color.RED, <%- camelizeWithLeadingLowercase(property.name) %>(Color.RED))
 <% } else {-%>
-            stop(1, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
-          )
+                stop(1, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
+              )
 <% } -%>
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.get<%- camelize(property.name) %>());
-    assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
-    assertEquals(SourceFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
-    assertEquals(IntervalStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.get<%- camelize(property.name) %>());
+        assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
+        assertEquals(SourceFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+      }
+    });
   }
 <% } else if (property.type === 'array') { -%>
 
@@ -233,30 +275,35 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("<%- property.name %>");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      <%- camelizeWithLeadingLowercase(property.name) %>(
-        property(
-          "FeaturePropertyA",
-          interval(
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          <%- camelizeWithLeadingLowercase(property.name) %>(
+            property(
+              "FeaturePropertyA",
+              interval(
 <% if (property.type == 'color') { -%>
-            stop(Color.RED, <%- camelizeWithLeadingLowercase(property.name) %>(Color.RED))
+                stop(Color.RED, <%- camelizeWithLeadingLowercase(property.name) %>(Color.RED))
 <% } else {-%>
-            stop(1, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
+                stop(1, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
 <% } -%>
+              )
+            )
           )
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.get<%- camelize(property.name) %>());
-    assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
-    assertEquals(SourceFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
-    assertEquals(IntervalStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+        );
+
+        // Verify
+        assertNotNull(layer.get<%- camelize(property.name) %>());
+        assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
+        assertEquals(SourceFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+      }
+    });
   }
 <% } else { -%>
 
@@ -265,30 +312,35 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("<%- property.name %>");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      <%- camelizeWithLeadingLowercase(property.name) %>(
-        property(
-          "FeaturePropertyA",
-          exponential(
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          <%- camelizeWithLeadingLowercase(property.name) %>(
+            property(
+              "FeaturePropertyA",
+              exponential(
 <% if (property.type == 'color') { -%>
-            stop(Color.RED, <%- camelizeWithLeadingLowercase(property.name) %>(Color.RED))
+                stop(Color.RED, <%- camelizeWithLeadingLowercase(property.name) %>(Color.RED))
 <% } else {-%>
-            stop(<%- defaultValueJava(property) %>, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
+                stop(<%- defaultValueJava(property) %>, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
 <% } -%>
-          ).withBase(0.5f)
-        )
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.get<%- camelize(property.name) %>());
-    assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
-    assertEquals(SourceFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+              ).withBase(0.5f)
+            )
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.get<%- camelize(property.name) %>());
+        assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
+        assertEquals(SourceFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+      }
+    });
   }
 
   @Test
@@ -296,39 +348,45 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("<%- property.name %>");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      <%- camelizeWithLeadingLowercase(property.name) %>(
-        property(
-          "FeaturePropertyA",
-          categorical(
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          <%- camelizeWithLeadingLowercase(property.name) %>(
+            property(
+              "FeaturePropertyA",
+              categorical(
 <% if (property.type == 'color') { -%>
-            stop("valueA", <%- camelizeWithLeadingLowercase(property.name) %>(Color.RED))
-          )
-        ).withDefaultValue(<%- camelizeWithLeadingLowercase(property.name) %>(Color.GREEN))
+                stop("valueA", <%- camelizeWithLeadingLowercase(property.name) %>(Color.RED))
+              )
+            ).withDefaultValue(<%- camelizeWithLeadingLowercase(property.name) %>(Color.GREEN))
 <% } else {-%>
-            stop(1.0f, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
-          )
-        ).withDefaultValue(<%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
+                stop(1.0f, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
+              )
+            ).withDefaultValue(<%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
 <% } -%>
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.get<%- camelize(property.name) %>());
-    assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
-    assertEquals(SourceFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
-    assertEquals(CategoricalStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
-    assertNotNull(((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getDefaultValue());
-    assertNotNull(((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getDefaultValue().getValue());
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.get<%- camelize(property.name) %>());
+        assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
+        assertEquals(SourceFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getDefaultValue().getValue());
 <% if (property.type === 'color') { -%>
-    assertEquals(Color.GREEN, (int) ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getDefaultValue().getColorInt());
+        assertEquals(Color.GREEN, (int) ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getDefaultValue().getColorInt());
 <% } else { -%>
-    assertEquals(<%- defaultValueJava(property) %>, ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getDefaultValue().getValue());
+        assertEquals(<%- defaultValueJava(property) %>, ((SourceFunction) layer.get<%- camelize(property.name) %>().getFunction()).getDefaultValue().getValue());
 <% } -%>
+      }
+    });
+
   }
 <% if (property.type !== 'color') { -%>
 
@@ -337,38 +395,43 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("<%- property.name %>");
-    assertNotNull(layer);
-
-    // Set
-    layer.setProperties(
-      <%- camelizeWithLeadingLowercase(property.name) %>(
-        composite(
-          "FeaturePropertyA",
-          exponential(
-            stop(0, 0.3f, <%- camelizeWithLeadingLowercase(property.name) %>(0.9f))
-          ).withBase(0.5f)
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          <%- camelizeWithLeadingLowercase(property.name) %>(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, <%- camelizeWithLeadingLowercase(property.name) %>(0.9f))
+              ).withBase(0.5f)
 <% if (property.type == 'number') { -%>
-        ).withDefaultValue(<%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
+            ).withDefaultValue(<%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
 <% } else { -%>
-        )
+            )
 <% } -%>
-      )
-    );
-
-    // Verify
-    assertNotNull(layer.get<%- camelize(property.name) %>());
-    assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
-    assertEquals(CompositeFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
-    assertEquals("FeaturePropertyA", ((CompositeFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
-    assertEquals(ExponentialStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
-    assertEquals(1, ((ExponentialStops) layer.get<%- camelize(property.name) %>().getFunction().getStops()).size());
-
-    ExponentialStops<Stop.CompositeValue<Float, <%- propertyType(property) %>>, <%- propertyType(property) %>> stops =
-      (ExponentialStops<Stop.CompositeValue<Float, <%- propertyType(property) %>>, <%- propertyType(property) %>>) layer.get<%- camelize(property.name) %>().getFunction().getStops();
-    Stop<Stop.CompositeValue<Float, <%- propertyType(property) %>>, <%- propertyType(property) %>> stop = stops.iterator().next();
-    assertEquals(0f, stop.in.zoom, 0.001);
-    assertEquals(0.3f, stop.in.value, 0.001f);
-    assertEquals(0.9f, stop.out, 0.001f);
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.get<%- camelize(property.name) %>());
+        assertNotNull(layer.get<%- camelize(property.name) %>().getFunction());
+        assertEquals(CompositeFunction.class, layer.get<%- camelize(property.name) %>().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.get<%- camelize(property.name) %>().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.get<%- camelize(property.name) %>().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.get<%- camelize(property.name) %>().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, <%- propertyType(property) %>>, <%- propertyType(property) %>> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, <%- propertyType(property) %>>, <%- propertyType(property) %>>) layer.get<%- camelize(property.name) %>().getFunction().getStops();
+        Stop<Stop.CompositeValue<Float, <%- propertyType(property) %>>, <%- propertyType(property) %>> stop = stops.iterator().next();
+        assertEquals(0f, stop.in.zoom, 0.001);
+        assertEquals(0.3f, stop.in.value, 0.001f);
+        assertEquals(0.9f, stop.out, 0.001f);
+      }
+    });
   }
 <% } -%>
 <% } -%>
@@ -380,11 +443,16 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("<%- property.name %>");
-    assertNotNull(layer);
-
-    // Set and Get
-    layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(Color.RED));
-    assertEquals(layer.get<%- camelize(property.name) %>AsInt(), Color.RED);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(Color.RED));
+        assertEquals(layer.get<%- camelize(property.name) %>AsInt(), Color.RED);
+      }
+    });
   }
 <% } -%>
 <% } -%>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs
index cb3ba58100..2f22a8f3f0 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs
@@ -9,6 +9,7 @@ import android.support.test.espresso.ViewAction;
 import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 
+import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.light.Light;
 import com.mapbox.mapboxsdk.style.functions.Function;
 import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops;
@@ -16,6 +17,7 @@ import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 import com.mapbox.mapboxsdk.style.light.Position;
 import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.style.FillExtrusionStyleTestActivity;
 
@@ -35,6 +37,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionCol
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionHeight;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionOpacity;
 
+import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 
@@ -48,14 +51,18 @@ public class LightTest extends BaseActivityTest {
   @Test
   public void test<%- camelize(property.name) %>Transition() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("<%- property.name %>TransitionOptions");
-    assertNotNull(light);
-
-    // Set and Get
-    TransitionOptions options = new TransitionOptions(300, 100);
-    light.set<%- camelize(property.name) %>Transition(options);
-    assertEquals("Transition options should match", options, light.get<%- camelize(property.name) %>Transition());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        TransitionOptions options = new TransitionOptions(300, 100);
+        light.set<%- camelize(property.name) %>Transition(options);
+        assertEquals("Transition options should match", options, light.get<%- camelize(property.name) %>Transition());
+      }
+    });
   }
 <% } -%>
 <% if (property.name == "position") { -%>
@@ -63,35 +70,44 @@ public class LightTest extends BaseActivityTest {
   @Test
   public void test<%- camelize(property.name) %>() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("<%- property.name %>");
-    assertNotNull(light);
-
-    // Set and Get
-    Position position = new Position(1,2,3);
-    light.set<%- camelize(property.name) %>(position);
-    assertEquals("Position should match", position, light.get<%- camelize(property.name) %>());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        Position position = new Position(1, 2, 3);
+        light.set<%- camelize(property.name) %>(position);
+        assertEquals("Position should match", position, light.get<%- camelize(property.name) %>());
+      }
+    });
   }
 <% } else { -%>
 
   @Test
   public void test<%- camelize(property.name) %>() {
     validateTestSetup();
-    setupLayer();
+    setupLight();
     Timber.i("<%- property.name %>");
-    assertNotNull(light);
-    // Set and Get
-    light.set<%- camelize(property.name) %>(<%- defaultValueJava(property) %>);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(light);
+        // Set and Get
+        light.set<%- camelize(property.name) %>(<%- defaultValueJava(property) %>);
 <% if (property.name == 'color') { -%>
-    assertEquals("<%- camelize(property.name) %> should match", <%- defaultValueJava(property) %>.replaceAll("\\s+",""), light.get<%- camelize(property.name) %>());
+        assertEquals("<%- camelize(property.name) %> should match", <%- defaultValueJava(property) %>.replaceAll("\\s+", ""), light.get<%- camelize(property.name) %>());
 <% } else { -%>
-    assertEquals("<%- camelize(property.name) %> should match", <%- defaultValueJava(property) %>, light.get<%- camelize(property.name) %>());
+        assertEquals("<%- camelize(property.name) %> should match", <%- defaultValueJava(property) %>, light.get<%- camelize(property.name) %>());
 <% } -%>
+      }
+    });
   }
 <% } -%>
 <% } -%>
 
-  private void setupLayer() {
+  private void setupLight() {
     onView(withId(R.id.mapView)).perform(new ViewAction() {
       @Override
       public Matcher<View> getConstraints() {
diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js
index bb04e3ba2a..a8b2c98c86 100644
--- a/platform/android/scripts/generate-style-code.js
+++ b/platform/android/scripts/generate-style-code.js
@@ -167,11 +167,11 @@ global.defaultValueJava = function(property) {
               case 'string':
                 return '[' + property['default'] + "]";
               case 'number':
-                var result ='new Float[]{';
+                var result ='new Float[] {';
                 for (var i = 0; i < property.length; i++) {
                     result += "0f";
                     if (i +1 != property.length) {
-                        result += ",";
+                        result += ", ";
                     }
                 }
                 return result + "}";