[android] - fix code generation, remove lamda, fixup color conversion locale

19 files changed, 7585 insertions, 6433 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
index 324b845dda..978fa29ef8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
@@ -8,6 +8,8 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+
 /**
  * The background color or pattern of the map.
  *
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
index ea96e4e9c3..10663142b5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
@@ -8,6 +8,8 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+
 /**
  * A filled circle.
  *
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
index d4cdb2a425..6772da73b1 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
@@ -8,6 +8,8 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+
 /**
  * An extruded (3D) polygon.
  *
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
index e639823ee1..3719ae9e1b 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
@@ -8,6 +8,8 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+
 /**
  * A filled polygon with an optional stroked border.
  *
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
index bbcfb98f07..ca106cc106 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
@@ -8,6 +8,8 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+
 /**
  * A stroked line.
  *
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
index fe164343b5..8b360413f8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
@@ -2,7 +2,6 @@
 
 package com.mapbox.mapboxsdk.style.layers;
 
-import android.annotation.SuppressLint;
 import android.support.annotation.ColorInt;
 
 import com.mapbox.mapboxsdk.style.functions.CameraFunction;
@@ -1536,7 +1535,6 @@ public class PropertyFactory {
     return new PaintPropertyValue<>("fill-extrusion-opacity", expression);
   }
 
-
   /**
    * The opacity of the entire fill extrusion layer. This is rendered on a per-layer, not per-feature, basis, and data-driven styling is not available.
    *
@@ -3365,6 +3363,7 @@ public class PropertyFactory {
     return new LayoutPropertyValue<>("text-optional", value);
   }
 
+
   /**
    * If true, icons will display without their corresponding text when the text collides with other symbols and the icon does not.
    *
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
index 0a056d8fac..a0f45535f6 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
@@ -2,9 +2,14 @@
 
 package com.mapbox.mapboxsdk.style.layers;
 
+import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.UiThread;
 
+import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
+
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+
 /**
  * Raster map textures such as satellite imagery.
  *
@@ -245,24 +250,6 @@ public class RasterLayer extends Layer {
     return (PropertyValue<Float>) new PropertyValue("raster-fade-duration", nativeGetRasterFadeDuration());
   }
 
-  /**
-   * Get the RasterFadeDuration property transition options
-   *
-   * @return transition options for Float
-   */
-  public TransitionOptions getRasterFadeDurationTransition() {
-    return nativeGetRasterFadeDurationTransition();
-  }
-
-  /**
-   * Set the RasterFadeDuration property transition options
-   *
-   * @param options transition options for Float
-   */
-  public void setRasterFadeDurationTransition(TransitionOptions options) {
-    nativeSetRasterFadeDurationTransition(options.getDuration(), options.getDelay());
-  }
-
   private native Object nativeGetRasterOpacity();
 
   private native TransitionOptions nativeGetRasterOpacityTransition();
@@ -301,10 +288,6 @@ public class RasterLayer extends Layer {
 
   private native Object nativeGetRasterFadeDuration();
 
-  private native TransitionOptions nativeGetRasterFadeDurationTransition();
-
-  private native void nativeSetRasterFadeDurationTransition(long duration, long delay);
-
   @Override
   protected native void finalize() throws Throwable;
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
index 3d2c3881b2..d0fb82dce5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
@@ -8,6 +8,8 @@ import android.support.annotation.UiThread;
 
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+
 /**
  * An icon or a text label.
  *
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs
index ed138e557a..283d4e4189 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/property_factory.java.ejs
@@ -6,12 +6,13 @@
 
 package com.mapbox.mapboxsdk.style.layers;
 
-import android.annotation.SuppressLint;
 import android.support.annotation.ColorInt;
 
-import com.mapbox.mapboxsdk.style.functions.Function;
 import com.mapbox.mapboxsdk.style.functions.CameraFunction;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
+import com.mapbox.mapboxsdk.style.functions.Function;
+
+import java.util.Locale;
 
 /**
  * Constructs paint/layout properties for Layers
@@ -154,9 +155,9 @@ public class PropertyFactory {
 
 <% } -%>
 <% } -%>
-  @SuppressLint("DefaultLocale")
   public static String colorToRgbaString(@ColorInt int value) {
-    return String.format("rgba(%d, %d, %d, %d)", (value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF, (value >> 24) & 0xFF);
+    return String.format(Locale.US,"rgba(%d, %d, %d, %d)",
+      (value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF, (value >> 24) & 0xFF);
   }
 
 }
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 50f2fa7d62..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,34 +3,38 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
 
+import timber.log.Timber;
+
+import com.mapbox.mapboxsdk.maps.MapboxMap;
+import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
 import com.mapbox.mapboxsdk.style.functions.CameraFunction;
+import com.mapbox.mapboxsdk.style.functions.SourceFunction;
+import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
+import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops;
 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.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import timber.log.Timber;
-
-import static com.mapbox.mapboxsdk.style.functions.Function.zoom;
+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.exponential;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.interval;
-import static com.mapbox.mapboxsdk.style.layers.Property.NONE;
-import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.backgroundColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.backgroundOpacity;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.backgroundPattern;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
 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.*;
+import static com.mapbox.mapboxsdk.style.layers.Property.*;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
+
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 /**
  * Basic smoke tests for BackgroundLayer
@@ -47,7 +51,12 @@ public class BackgroundLayerTest extends BaseActivityTest {
 
   private void setupLayer() {
     Timber.i("Retrieving layer");
-    invoke(mapboxMap, (uiController, mapboxMap) -> layer = mapboxMap.getLayerAs("background"));
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        layer = mapboxMap.getLayerAs("background");
+      }
+    });
   }
 
   @Test
@@ -55,15 +64,18 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -72,13 +84,16 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -87,12 +102,15 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -101,27 +119,30 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        backgroundColor(
-          zoom(
-            exponential(
-              stop(2, backgroundColor("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(
+          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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -130,12 +151,15 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -144,13 +168,16 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-patternTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -159,12 +186,15 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-pattern");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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");
+      }
     });
   }
 
@@ -173,26 +203,29 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-pattern");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -201,13 +234,16 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -216,12 +252,15 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -230,27 +269,30 @@ public class BackgroundLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("background-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        backgroundOpacity(
-          zoom(
-            exponential(
-              stop(2, backgroundOpacity(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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/CircleLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
index af6ed7f5b9..559e446307 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,10 +3,14 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
 
-import com.mapbox.mapboxsdk.style.functions.CameraFunction;
+import timber.log.Timber;
+
+import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
+import com.mapbox.mapboxsdk.style.functions.CameraFunction;
 import com.mapbox.mapboxsdk.style.functions.SourceFunction;
 import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
@@ -15,42 +19,22 @@ 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.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import timber.log.Timber;
-
-import static com.mapbox.mapboxsdk.style.functions.Function.composite;
-import static com.mapbox.mapboxsdk.style.functions.Function.property;
-import static com.mapbox.mapboxsdk.style.functions.Function.zoom;
+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.categorical;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.exponential;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.interval;
-import static com.mapbox.mapboxsdk.style.layers.Property.CIRCLE_PITCH_ALIGNMENT_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.CIRCLE_PITCH_SCALE_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.CIRCLE_TRANSLATE_ANCHOR_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.NONE;
-import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleBlur;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleOpacity;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circlePitchAlignment;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circlePitchScale;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleRadius;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleStrokeColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleStrokeOpacity;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleStrokeWidth;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleTranslate;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleTranslateAnchor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
 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.*;
+import static com.mapbox.mapboxsdk.style.layers.Property.*;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
+
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 /**
  * Basic smoke tests for CircleLayer
@@ -67,14 +51,17 @@ public class CircleLayerTest extends BaseActivityTest {
 
   private void setupLayer() {
     Timber.i("Retrieving layer");
-    invoke(mapboxMap, (uiController, 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");
+    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");
+        }
       }
     });
   }
@@ -84,15 +71,18 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -101,16 +91,19 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -119,13 +112,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radiusTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -134,12 +130,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -148,27 +147,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleRadius(
-          zoom(
-            exponential(
-              stop(2, circleRadius(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -177,20 +179,23 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -199,27 +204,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleRadius(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, circleRadius(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -228,30 +236,33 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleRadius(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -261,35 +272,38 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -298,13 +312,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -313,12 +330,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -327,27 +347,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleColor(
-          zoom(
-            exponential(
-              stop(2, circleColor("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(
+          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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -356,20 +379,23 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -378,27 +404,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleColor(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(Color.RED, circleColor(Color.RED))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -407,30 +436,33 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleColor(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop("valueA", circleColor(Color.RED))
-            )
-          ).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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -440,12 +472,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -454,13 +489,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blurTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -469,12 +507,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -483,27 +524,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleBlur(
-          zoom(
-            exponential(
-              stop(2, circleBlur(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -512,20 +556,23 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -534,27 +581,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleBlur(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, circleBlur(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -563,30 +613,33 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleBlur(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -596,35 +649,38 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -633,13 +689,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -648,12 +707,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -662,27 +724,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleOpacity(
-          zoom(
-            exponential(
-              stop(2, circleOpacity(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -691,20 +756,23 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -713,27 +781,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleOpacity(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, circleOpacity(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -742,30 +813,33 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleOpacity(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -775,35 +849,38 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -812,13 +889,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translateTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -827,12 +907,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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});
+      }
     });
   }
 
@@ -841,27 +924,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleTranslate(
-          zoom(
-            exponential(
-              stop(2, circleTranslate(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(
+          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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -870,12 +956,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -884,26 +973,29 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -912,12 +1004,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-pitch-scale");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -926,26 +1021,29 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-pitch-scale");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -954,12 +1052,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-pitch-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(circlePitchAlignment(CIRCLE_PITCH_ALIGNMENT_MAP));
-      assertEquals((String) layer.getCirclePitchAlignment().getValue(), (String) CIRCLE_PITCH_ALIGNMENT_MAP);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(circlePitchAlignment(CIRCLE_PITCH_ALIGNMENT_MAP));
+        assertEquals((String) layer.getCirclePitchAlignment().getValue(), (String) CIRCLE_PITCH_ALIGNMENT_MAP);
+      }
     });
   }
 
@@ -968,26 +1069,29 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-pitch-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circlePitchAlignment(
-          zoom(
-            interval(
-              stop(2, circlePitchAlignment(CIRCLE_PITCH_ALIGNMENT_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          circlePitchAlignment(
+            zoom(
+              interval(
+                stop(2, circlePitchAlignment(CIRCLE_PITCH_ALIGNMENT_MAP))
+              )
             )
           )
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getCirclePitchAlignment());
-      assertNotNull(layer.getCirclePitchAlignment().getFunction());
-      assertEquals(CameraFunction.class, layer.getCirclePitchAlignment().getFunction().getClass());
-      assertEquals(IntervalStops.class, layer.getCirclePitchAlignment().getFunction().getStops().getClass());
-      assertEquals(1, ((IntervalStops) layer.getCirclePitchAlignment().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getCirclePitchAlignment());
+        assertNotNull(layer.getCirclePitchAlignment().getFunction());
+        assertEquals(CameraFunction.class, layer.getCirclePitchAlignment().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getCirclePitchAlignment().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getCirclePitchAlignment().getFunction().getStops()).size());
+      }
     });
   }
 
@@ -996,13 +1100,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-widthTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1011,12 +1118,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1025,27 +1135,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleStrokeWidth(
-          zoom(
-            exponential(
-              stop(2, circleStrokeWidth(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1054,20 +1167,23 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -1076,27 +1192,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleStrokeWidth(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, circleStrokeWidth(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1105,30 +1224,33 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleStrokeWidth(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -1138,35 +1260,38 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -1175,13 +1300,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1190,12 +1318,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -1204,27 +1335,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleStrokeColor(
-          zoom(
-            exponential(
-              stop(2, circleStrokeColor("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(
+          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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1233,20 +1367,23 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -1255,27 +1392,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleStrokeColor(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(Color.RED, circleStrokeColor(Color.RED))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1284,30 +1424,33 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleStrokeColor(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop("valueA", circleStrokeColor(Color.RED))
-            )
-          ).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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -1317,12 +1460,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1331,13 +1477,16 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1346,12 +1495,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1360,27 +1512,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleStrokeOpacity(
-          zoom(
-            exponential(
-              stop(2, circleStrokeOpacity(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1389,20 +1544,23 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -1411,27 +1569,30 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleStrokeOpacity(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, circleStrokeOpacity(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1440,30 +1601,33 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        circleStrokeOpacity(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -1473,35 +1637,38 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    invoke(mapboxMap, (uiController, 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);
+    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 3a1cba5cf2..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,10 +3,14 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
 
-import com.mapbox.mapboxsdk.style.functions.CameraFunction;
+import timber.log.Timber;
+
+import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
+import com.mapbox.mapboxsdk.style.functions.CameraFunction;
 import com.mapbox.mapboxsdk.style.functions.SourceFunction;
 import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
@@ -15,36 +19,22 @@ 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.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import timber.log.Timber;
-
-import static com.mapbox.mapboxsdk.style.functions.Function.composite;
-import static com.mapbox.mapboxsdk.style.functions.Function.property;
-import static com.mapbox.mapboxsdk.style.functions.Function.zoom;
+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.categorical;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.exponential;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.interval;
-import static com.mapbox.mapboxsdk.style.layers.Property.FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.NONE;
-import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionBase;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionHeight;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionOpacity;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionPattern;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionTranslate;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionTranslateAnchor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
 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.*;
+import static com.mapbox.mapboxsdk.style.layers.Property.*;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
+
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 /**
  * Basic smoke tests for FillExtrusionLayer
@@ -61,14 +51,17 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
 
   private void setupLayer() {
     Timber.i("Retrieving layer");
-    invoke(mapboxMap, (uiController, 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");
+    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");
+        }
       }
     });
   }
@@ -78,15 +71,18 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -95,16 +91,19 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -113,13 +112,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillExtrusionOpacityTransition(options);
-      assertEquals(layer.getFillExtrusionOpacityTransition(), 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.setFillExtrusionOpacityTransition(options);
+        assertEquals(layer.getFillExtrusionOpacityTransition(), options);
+      }
     });
   }
 
@@ -128,12 +130,15 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillExtrusionOpacity(0.3f));
-      assertEquals((Float) layer.getFillExtrusionOpacity().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -142,27 +147,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -171,13 +179,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillExtrusionColorTransition(options);
-      assertEquals(layer.getFillExtrusionColorTransition(), 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.setFillExtrusionColorTransition(options);
+        assertEquals(layer.getFillExtrusionColorTransition(), options);
+      }
     });
   }
 
@@ -186,12 +197,15 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -200,27 +214,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -229,20 +246,23 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -251,27 +271,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -280,30 +303,33 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        fillExtrusionColor(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop("valueA", fillExtrusionColor(Color.RED))
-            )
-          ).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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -313,12 +339,15 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillExtrusionColor(Color.RED));
-      assertEquals(layer.getFillExtrusionColorAsInt(), Color.RED);
+    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);
+      }
     });
   }
 
@@ -327,13 +356,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translateTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillExtrusionTranslateTransition(options);
-      assertEquals(layer.getFillExtrusionTranslateTransition(), 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.setFillExtrusionTranslateTransition(options);
+        assertEquals(layer.getFillExtrusionTranslateTransition(), options);
+      }
     });
   }
 
@@ -342,12 +374,15 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillExtrusionTranslate(new Float[] {0f, 0f}));
-      assertEquals((Float[]) layer.getFillExtrusionTranslate().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(fillExtrusionTranslate(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getFillExtrusionTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
     });
   }
 
@@ -356,27 +391,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -385,12 +423,15 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate-anchor");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -399,26 +440,29 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -427,13 +471,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-patternTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillExtrusionPatternTransition(options);
-      assertEquals(layer.getFillExtrusionPatternTransition(), 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.setFillExtrusionPatternTransition(options);
+        assertEquals(layer.getFillExtrusionPatternTransition(), options);
+      }
     });
   }
 
@@ -442,12 +489,15 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-pattern");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillExtrusionPattern("pedestrian-polygon"));
-      assertEquals((String) layer.getFillExtrusionPattern().getValue(), (String) "pedestrian-polygon");
+    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");
+      }
     });
   }
 
@@ -456,26 +506,29 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-pattern");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -484,13 +537,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-heightTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillExtrusionHeightTransition(options);
-      assertEquals(layer.getFillExtrusionHeightTransition(), 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.setFillExtrusionHeightTransition(options);
+        assertEquals(layer.getFillExtrusionHeightTransition(), options);
+      }
     });
   }
 
@@ -499,12 +555,15 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillExtrusionHeight(0.3f));
-      assertEquals((Float) layer.getFillExtrusionHeight().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -513,27 +572,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -542,20 +604,23 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -564,27 +629,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -593,30 +661,33 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        fillExtrusionHeight(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -626,35 +697,38 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-height");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -663,13 +737,16 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-baseTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillExtrusionBaseTransition(options);
-      assertEquals(layer.getFillExtrusionBaseTransition(), 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.setFillExtrusionBaseTransition(options);
+        assertEquals(layer.getFillExtrusionBaseTransition(), options);
+      }
     });
   }
 
@@ -678,12 +755,15 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillExtrusionBase(0.3f));
-      assertEquals((Float) layer.getFillExtrusionBase().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -692,27 +772,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -721,20 +804,23 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -743,27 +829,30 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -772,30 +861,33 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        fillExtrusionBase(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -805,35 +897,38 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-extrusion-base");
-    invoke(mapboxMap, (uiController, 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);
+    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 a5e7ea5fc9..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,10 +3,14 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
 
-import com.mapbox.mapboxsdk.style.functions.CameraFunction;
+import timber.log.Timber;
+
+import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
+import com.mapbox.mapboxsdk.style.functions.CameraFunction;
 import com.mapbox.mapboxsdk.style.functions.SourceFunction;
 import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
@@ -15,36 +19,22 @@ 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.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import timber.log.Timber;
-
-import static com.mapbox.mapboxsdk.style.functions.Function.composite;
-import static com.mapbox.mapboxsdk.style.functions.Function.property;
-import static com.mapbox.mapboxsdk.style.functions.Function.zoom;
+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.categorical;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.exponential;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.interval;
-import static com.mapbox.mapboxsdk.style.layers.Property.FILL_TRANSLATE_ANCHOR_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.NONE;
-import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillAntialias;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillOpacity;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillOutlineColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillPattern;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillTranslate;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillTranslateAnchor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
 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.*;
+import static com.mapbox.mapboxsdk.style.layers.Property.*;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
+
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 /**
  * Basic smoke tests for FillLayer
@@ -61,14 +51,17 @@ public class FillLayerTest extends BaseActivityTest {
 
   private void setupLayer() {
     Timber.i("Retrieving layer");
-    invoke(mapboxMap, (uiController, 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");
+    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");
+        }
       }
     });
   }
@@ -78,15 +71,18 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -95,16 +91,19 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -113,12 +112,15 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-antialias");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillAntialias(true));
-      assertEquals((Boolean) layer.getFillAntialias().getValue(), (Boolean) true);
+    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);
+      }
     });
   }
 
@@ -127,26 +129,29 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-antialias");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -155,13 +160,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillOpacityTransition(options);
-      assertEquals(layer.getFillOpacityTransition(), 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.setFillOpacityTransition(options);
+        assertEquals(layer.getFillOpacityTransition(), options);
+      }
     });
   }
 
@@ -170,12 +178,15 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillOpacity(0.3f));
-      assertEquals((Float) layer.getFillOpacity().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -184,27 +195,30 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -213,20 +227,23 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -235,27 +252,30 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -264,30 +284,33 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        fillOpacity(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -297,35 +320,38 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-opacity");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -334,13 +360,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillColorTransition(options);
-      assertEquals(layer.getFillColorTransition(), 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.setFillColorTransition(options);
+        assertEquals(layer.getFillColorTransition(), options);
+      }
     });
   }
 
@@ -349,12 +378,15 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -363,27 +395,30 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -392,20 +427,23 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -414,27 +452,30 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -443,30 +484,33 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        fillColor(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop("valueA", fillColor(Color.RED))
-            )
-          ).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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -476,12 +520,15 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillColor(Color.RED));
-      assertEquals(layer.getFillColorAsInt(), Color.RED);
+    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);
+      }
     });
   }
 
@@ -490,13 +537,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillOutlineColorTransition(options);
-      assertEquals(layer.getFillOutlineColorTransition(), 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.setFillOutlineColorTransition(options);
+        assertEquals(layer.getFillOutlineColorTransition(), options);
+      }
     });
   }
 
@@ -505,12 +555,15 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -519,27 +572,30 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -548,20 +604,23 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -570,27 +629,30 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -599,30 +661,33 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        fillOutlineColor(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop("valueA", fillOutlineColor(Color.RED))
-            )
-          ).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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -632,12 +697,15 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-outline-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillOutlineColor(Color.RED));
-      assertEquals(layer.getFillOutlineColorAsInt(), Color.RED);
+    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);
+      }
     });
   }
 
@@ -646,13 +714,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-translateTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillTranslateTransition(options);
-      assertEquals(layer.getFillTranslateTransition(), 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.setFillTranslateTransition(options);
+        assertEquals(layer.getFillTranslateTransition(), options);
+      }
     });
   }
 
@@ -661,12 +732,15 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillTranslate(new Float[] {0f, 0f}));
-      assertEquals((Float[]) layer.getFillTranslate().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(fillTranslate(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getFillTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
     });
   }
 
@@ -675,27 +749,30 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -704,12 +781,15 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillTranslateAnchor(FILL_TRANSLATE_ANCHOR_MAP));
-      assertEquals((String) layer.getFillTranslateAnchor().getValue(), (String) FILL_TRANSLATE_ANCHOR_MAP);
+    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);
+      }
     });
   }
 
@@ -718,26 +798,29 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -746,13 +829,16 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-patternTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setFillPatternTransition(options);
-      assertEquals(layer.getFillPatternTransition(), 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.setFillPatternTransition(options);
+        assertEquals(layer.getFillPatternTransition(), options);
+      }
     });
   }
 
@@ -761,12 +847,15 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-pattern");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(fillPattern("pedestrian-polygon"));
-      assertEquals((String) layer.getFillPattern().getValue(), (String) "pedestrian-polygon");
+    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");
+      }
     });
   }
 
@@ -775,26 +864,29 @@ public class FillLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("fill-pattern");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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 21026527c5..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,22 +6,24 @@ 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;
 import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
-import com.mapbox.mapboxsdk.style.light.Light;
 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;
 
+import timber.log.Timber;
+
 import org.hamcrest.Matcher;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-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;
@@ -31,6 +33,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionBas
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionColor;
 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;
@@ -45,11 +48,14 @@ public class LightTest extends BaseActivityTest {
     validateTestSetup();
     setupLight();
     Timber.i("anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -58,12 +64,15 @@ public class LightTest extends BaseActivityTest {
     validateTestSetup();
     setupLight();
     Timber.i("positionTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -72,12 +81,15 @@ public class LightTest extends BaseActivityTest {
     validateTestSetup();
     setupLight();
     Timber.i("position");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -86,12 +98,15 @@ public class LightTest extends BaseActivityTest {
     validateTestSetup();
     setupLight();
     Timber.i("colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -100,11 +115,14 @@ public class LightTest extends BaseActivityTest {
     validateTestSetup();
     setupLight();
     Timber.i("color");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -113,12 +131,15 @@ public class LightTest extends BaseActivityTest {
     validateTestSetup();
     setupLight();
     Timber.i("intensityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -127,11 +148,14 @@ public class LightTest extends BaseActivityTest {
     validateTestSetup();
     setupLight();
     Timber.i("intensity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
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 544c5505ed..8123d24be8 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,10 +3,14 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
 
-import com.mapbox.mapboxsdk.style.functions.CameraFunction;
+import timber.log.Timber;
+
+import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
+import com.mapbox.mapboxsdk.style.functions.CameraFunction;
 import com.mapbox.mapboxsdk.style.functions.SourceFunction;
 import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
@@ -15,45 +19,22 @@ 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.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import timber.log.Timber;
-
-import static com.mapbox.mapboxsdk.style.functions.Function.composite;
-import static com.mapbox.mapboxsdk.style.functions.Function.property;
-import static com.mapbox.mapboxsdk.style.functions.Function.zoom;
+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.categorical;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.exponential;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.interval;
-import static com.mapbox.mapboxsdk.style.layers.Property.LINE_CAP_BUTT;
-import static com.mapbox.mapboxsdk.style.layers.Property.LINE_JOIN_BEVEL;
-import static com.mapbox.mapboxsdk.style.layers.Property.LINE_TRANSLATE_ANCHOR_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.NONE;
-import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineBlur;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineCap;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineDasharray;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineGapWidth;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineJoin;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineMiterLimit;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineOffset;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineOpacity;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.linePattern;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineRoundLimit;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineTranslate;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineTranslateAnchor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineWidth;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
 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.*;
+import static com.mapbox.mapboxsdk.style.layers.Property.*;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
+
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 /**
  * Basic smoke tests for LineLayer
@@ -70,14 +51,17 @@ public class LineLayerTest extends BaseActivityTest {
 
   private void setupLayer() {
     Timber.i("Retrieving layer");
-    invoke(mapboxMap, (uiController, 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");
+    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");
+        }
       }
     });
   }
@@ -87,15 +71,18 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -104,16 +91,19 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -122,12 +112,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-cap");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -136,26 +129,29 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-cap");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -164,12 +160,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-join");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -178,26 +177,29 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-join");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -206,20 +208,23 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-join");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineJoin(property("FeaturePropertyA", Stops.<String>identity()))
-      );
-
-      // Verify
-      assertNotNull(layer.getLineJoin());
-      assertNotNull(layer.getLineJoin().getFunction());
-      assertEquals(SourceFunction.class, layer.getLineJoin().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineJoin().getFunction()).getProperty());
-      assertEquals(IdentityStops.class, layer.getLineJoin().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineJoin(property("FeaturePropertyA", Stops.<String>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getLineJoin());
+        assertNotNull(layer.getLineJoin().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineJoin().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineJoin().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getLineJoin().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -228,27 +233,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-join");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineJoin(
-          property(
-            "FeaturePropertyA",
-            interval(
-              stop(1, lineJoin(LINE_JOIN_BEVEL))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineJoin(
+            property(
+              "FeaturePropertyA",
+              interval(
+                stop(1, lineJoin(LINE_JOIN_BEVEL))
+              )
             )
           )
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getLineJoin());
-      assertNotNull(layer.getLineJoin().getFunction());
-      assertEquals(SourceFunction.class, layer.getLineJoin().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineJoin().getFunction()).getProperty());
-      assertEquals(IntervalStops.class, layer.getLineJoin().getFunction().getStops().getClass());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineJoin());
+        assertNotNull(layer.getLineJoin().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineJoin().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineJoin().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.getLineJoin().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -257,12 +265,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-miter-limit");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -271,27 +282,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-miter-limit");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineMiterLimit(
-          zoom(
-            exponential(
-              stop(2, lineMiterLimit(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -300,12 +314,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-round-limit");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -314,27 +331,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-round-limit");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineRoundLimit(
-          zoom(
-            exponential(
-              stop(2, lineRoundLimit(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -343,13 +363,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -358,12 +381,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -372,27 +398,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineOpacity(
-          zoom(
-            exponential(
-              stop(2, lineOpacity(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -401,20 +430,23 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -423,27 +455,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineOpacity(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, lineOpacity(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -452,30 +487,33 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineOpacity(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -485,35 +523,38 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-opacity");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -522,13 +563,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -537,12 +581,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -551,27 +598,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineColor(
-          zoom(
-            exponential(
-              stop(2, lineColor("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(
+          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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -580,20 +630,23 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -602,27 +655,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineColor(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(Color.RED, lineColor(Color.RED))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -631,30 +687,33 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineColor(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop("valueA", lineColor(Color.RED))
-            )
-          ).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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -664,12 +723,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -678,13 +740,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-translateTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -693,12 +758,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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});
+      }
     });
   }
 
@@ -707,27 +775,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineTranslate(
-          zoom(
-            exponential(
-              stop(2, lineTranslate(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(
+          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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -736,12 +807,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -750,26 +824,29 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -778,13 +855,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-widthTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -793,12 +873,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -807,27 +890,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineWidth(
-          zoom(
-            exponential(
-              stop(2, lineWidth(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -836,20 +922,23 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineWidth(property("FeaturePropertyA", Stops.<Float>identity()))
-      );
-
-      // Verify
-      assertNotNull(layer.getLineWidth());
-      assertNotNull(layer.getLineWidth().getFunction());
-      assertEquals(SourceFunction.class, layer.getLineWidth().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineWidth().getFunction()).getProperty());
-      assertEquals(IdentityStops.class, layer.getLineWidth().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineWidth(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getLineWidth());
+        assertNotNull(layer.getLineWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineWidth().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getLineWidth().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -858,27 +947,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineWidth(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, lineWidth(0.3f))
-            ).withBase(0.5f)
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineWidth(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, lineWidth(0.3f))
+              ).withBase(0.5f)
+            )
           )
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getLineWidth());
-      assertNotNull(layer.getLineWidth().getFunction());
-      assertEquals(SourceFunction.class, layer.getLineWidth().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineWidth().getFunction()).getProperty());
-      assertEquals(ExponentialStops.class, layer.getLineWidth().getFunction().getStops().getClass());
+        );
+
+        // Verify
+        assertNotNull(layer.getLineWidth());
+        assertNotNull(layer.getLineWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineWidth().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -887,30 +979,33 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineWidth(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, lineWidth(0.3f))
-            )
-          ).withDefaultValue(lineWidth(0.3f))
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getLineWidth());
-      assertNotNull(layer.getLineWidth().getFunction());
-      assertEquals(SourceFunction.class, layer.getLineWidth().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineWidth().getFunction()).getProperty());
-      assertEquals(CategoricalStops.class, layer.getLineWidth().getFunction().getStops().getClass());
-      assertNotNull(((SourceFunction) layer.getLineWidth().getFunction()).getDefaultValue());
-      assertNotNull(((SourceFunction) layer.getLineWidth().getFunction()).getDefaultValue().getValue());
-      assertEquals(0.3f, ((SourceFunction) layer.getLineWidth().getFunction()).getDefaultValue().getValue());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          lineWidth(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, lineWidth(0.3f))
+              )
+            ).withDefaultValue(lineWidth(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineWidth());
+        assertNotNull(layer.getLineWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getLineWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getLineWidth().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getLineWidth().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getLineWidth().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getLineWidth().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getLineWidth().getFunction()).getDefaultValue().getValue());
+      }
     });
 
   }
@@ -920,35 +1015,38 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineWidth(
-          composite(
-            "FeaturePropertyA",
-            exponential(
-              stop(0, 0.3f, lineWidth(0.9f))
-            ).withBase(0.5f)
-          ).withDefaultValue(lineWidth(0.3f))
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getLineWidth());
-      assertNotNull(layer.getLineWidth().getFunction());
-      assertEquals(CompositeFunction.class, layer.getLineWidth().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineWidth().getFunction()).getProperty());
-      assertEquals(ExponentialStops.class, layer.getLineWidth().getFunction().getStops().getClass());
-      assertEquals(1, ((ExponentialStops) layer.getLineWidth().getFunction().getStops()).size());
-
-      ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-        (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineWidth().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(
+          lineWidth(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, lineWidth(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(lineWidth(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getLineWidth());
+        assertNotNull(layer.getLineWidth().getFunction());
+        assertEquals(CompositeFunction.class, layer.getLineWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getLineWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getLineWidth().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getLineWidth().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getLineWidth().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);
+      }
     });
   }
 
@@ -957,13 +1055,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-widthTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -972,12 +1073,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -986,27 +1090,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineGapWidth(
-          zoom(
-            exponential(
-              stop(2, lineGapWidth(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1015,20 +1122,23 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -1037,27 +1147,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineGapWidth(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, lineGapWidth(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1066,30 +1179,33 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineGapWidth(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -1099,35 +1215,38 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-gap-width");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -1136,13 +1255,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offsetTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1151,12 +1273,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1165,27 +1290,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineOffset(
-          zoom(
-            exponential(
-              stop(2, lineOffset(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1194,20 +1322,23 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -1216,27 +1347,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineOffset(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, lineOffset(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1245,30 +1379,33 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineOffset(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -1278,35 +1415,38 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-offset");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -1315,13 +1455,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blurTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1330,12 +1473,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1344,27 +1490,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineBlur(
-          zoom(
-            exponential(
-              stop(2, lineBlur(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1373,20 +1522,23 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    invoke(mapboxMap, (uiController, 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());
+    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());
+      }
     });
   }
 
@@ -1395,27 +1547,30 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineBlur(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, lineBlur(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -1424,30 +1579,33 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        lineBlur(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -1457,35 +1615,38 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-blur");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -1494,13 +1655,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-dasharrayTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1509,12 +1673,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-dasharray");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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[] {});
+      }
     });
   }
 
@@ -1523,26 +1690,29 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-dasharray");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1551,13 +1721,16 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-patternTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -1566,12 +1739,15 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-pattern");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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");
+      }
     });
   }
 
@@ -1580,26 +1756,29 @@ public class LineLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("line-pattern");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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 11368767fe..df560e2632 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
@@ -2,36 +2,39 @@
 
 package com.mapbox.mapboxsdk.testapp.style;
 
+import android.graphics.Color;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
 
+import timber.log.Timber;
+
+import com.mapbox.mapboxsdk.maps.MapboxMap;
+import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
 import com.mapbox.mapboxsdk.style.functions.CameraFunction;
+import com.mapbox.mapboxsdk.style.functions.SourceFunction;
+import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
+import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops;
+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.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import timber.log.Timber;
-
-import static com.mapbox.mapboxsdk.style.functions.Function.zoom;
+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.exponential;
-import static com.mapbox.mapboxsdk.style.layers.Property.NONE;
-import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterBrightnessMax;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterBrightnessMin;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterContrast;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterFadeDuration;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterHueRotate;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterOpacity;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.rasterSaturation;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
 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.*;
+import static com.mapbox.mapboxsdk.style.layers.Property.*;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
+
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 /**
  * Basic smoke tests for RasterLayer
@@ -48,14 +51,17 @@ public class RasterLayerTest extends BaseActivityTest {
 
   private void setupLayer() {
     Timber.i("Retrieving layer");
-    invoke(mapboxMap, (uiController, 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");
+    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");
+        }
       }
     });
   }
@@ -65,15 +71,18 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -82,13 +91,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -97,12 +109,15 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -111,27 +126,30 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        rasterOpacity(
-          zoom(
-            exponential(
-              stop(2, rasterOpacity(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -140,13 +158,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotateTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -155,12 +176,15 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -169,27 +193,30 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        rasterHueRotate(
-          zoom(
-            exponential(
-              stop(2, rasterHueRotate(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -198,13 +225,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-minTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -213,12 +243,15 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-min");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -227,27 +260,30 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-min");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        rasterBrightnessMin(
-          zoom(
-            exponential(
-              stop(2, rasterBrightnessMin(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -256,13 +292,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-maxTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -271,12 +310,15 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-max");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -285,27 +327,30 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-max");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        rasterBrightnessMax(
-          zoom(
-            exponential(
-              stop(2, rasterBrightnessMax(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -314,13 +359,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturationTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -329,12 +377,15 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturation");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -343,27 +394,30 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturation");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        rasterSaturation(
-          zoom(
-            exponential(
-              stop(2, rasterSaturation(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -372,13 +426,16 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrastTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -387,12 +444,15 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrast");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -401,42 +461,30 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrast");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        rasterContrast(
-          zoom(
-            exponential(
-              stop(2, rasterContrast(0.3f))
-            ).withBase(0.5f)
+    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
-  public void testRasterFadeDurationTransition() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("raster-fade-durationTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setRasterFadeDurationTransition(options);
-      assertEquals(layer.getRasterFadeDurationTransition(), options);
+        );
+
+        // 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());
+      }
     });
   }
 
@@ -445,12 +493,15 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-fade-duration");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -459,27 +510,30 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-fade-duration");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        rasterFadeDuration(
-          zoom(
-            exponential(
-              stop(2, rasterFadeDuration(0.3f))
-            ).withBase(0.5f)
+    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());
+        );
+
+        // 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/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
index cb79700430..f8248ae4a7 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,10 +3,14 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
+import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
 
-import com.mapbox.mapboxsdk.style.functions.CameraFunction;
+import timber.log.Timber;
+
+import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
+import com.mapbox.mapboxsdk.style.functions.CameraFunction;
 import com.mapbox.mapboxsdk.style.functions.SourceFunction;
 import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops;
 import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
@@ -15,90 +19,22 @@ 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.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import timber.log.Timber;
-
-import static com.mapbox.mapboxsdk.style.functions.Function.composite;
-import static com.mapbox.mapboxsdk.style.functions.Function.property;
-import static com.mapbox.mapboxsdk.style.functions.Function.zoom;
+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.categorical;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.exponential;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.interval;
-import static com.mapbox.mapboxsdk.style.layers.Property.ICON_ANCHOR_CENTER;
-import static com.mapbox.mapboxsdk.style.layers.Property.ICON_PITCH_ALIGNMENT_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.ICON_TEXT_FIT_NONE;
-import static com.mapbox.mapboxsdk.style.layers.Property.ICON_TRANSLATE_ANCHOR_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.NONE;
-import static com.mapbox.mapboxsdk.style.layers.Property.SYMBOL_PLACEMENT_POINT;
-import static com.mapbox.mapboxsdk.style.layers.Property.TEXT_ANCHOR_CENTER;
-import static com.mapbox.mapboxsdk.style.layers.Property.TEXT_JUSTIFY_LEFT;
-import static com.mapbox.mapboxsdk.style.layers.Property.TEXT_PITCH_ALIGNMENT_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.TEXT_ROTATION_ALIGNMENT_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.TEXT_TRANSFORM_NONE;
-import static com.mapbox.mapboxsdk.style.layers.Property.TEXT_TRANSLATE_ANCHOR_MAP;
-import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconAllowOverlap;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconAnchor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconHaloBlur;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconHaloColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconHaloWidth;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconIgnorePlacement;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconImage;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconKeepUpright;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconOffset;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconOpacity;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconOptional;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconPadding;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconPitchAlignment;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconRotate;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconRotationAlignment;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconSize;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconTextFit;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconTextFitPadding;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconTranslate;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconTranslateAnchor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.symbolAvoidEdges;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.symbolPlacement;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.symbolSpacing;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textAllowOverlap;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textAnchor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textField;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textFont;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textHaloBlur;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textHaloColor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textHaloWidth;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textIgnorePlacement;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textJustify;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textKeepUpright;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textLetterSpacing;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textLineHeight;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textMaxAngle;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textMaxWidth;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textOffset;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textOpacity;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textOptional;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textPadding;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textPitchAlignment;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textRotate;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textRotationAlignment;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textSize;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textTransform;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textTranslate;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.textTranslateAnchor;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
+import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
 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.*;
+import static com.mapbox.mapboxsdk.style.layers.Property.*;
+import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
+
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
 
 /**
  * Basic smoke tests for SymbolLayer
@@ -115,14 +51,17 @@ public class SymbolLayerTest extends BaseActivityTest {
 
   private void setupLayer() {
     Timber.i("Retrieving layer");
-    invoke(mapboxMap, (uiController, 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");
+    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");
+        }
       }
     });
   }
@@ -132,15 +71,18 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -149,16 +91,19 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("SourceLayer");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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);
+      }
     });
   }
 
@@ -167,12 +112,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-placement");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(symbolPlacement(SYMBOL_PLACEMENT_POINT));
-      assertEquals((String) layer.getSymbolPlacement().getValue(), (String) SYMBOL_PLACEMENT_POINT);
+    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);
+      }
     });
   }
 
@@ -181,26 +129,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-placement");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -209,12 +160,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-spacing");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(symbolSpacing(0.3f));
-      assertEquals((Float) layer.getSymbolSpacing().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -223,27 +177,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-spacing");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -252,12 +209,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-avoid-edges");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(symbolAvoidEdges(true));
-      assertEquals((Boolean) layer.getSymbolAvoidEdges().getValue(), (Boolean) true);
+    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);
+      }
     });
   }
 
@@ -266,26 +226,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("symbol-avoid-edges");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -294,12 +257,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-allow-overlap");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconAllowOverlap(true));
-      assertEquals((Boolean) layer.getIconAllowOverlap().getValue(), (Boolean) true);
+    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);
+      }
     });
   }
 
@@ -308,26 +274,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-allow-overlap");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -336,12 +305,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-ignore-placement");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconIgnorePlacement(true));
-      assertEquals((Boolean) layer.getIconIgnorePlacement().getValue(), (Boolean) true);
+    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);
+      }
     });
   }
 
@@ -350,26 +322,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-ignore-placement");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -378,12 +353,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-optional");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconOptional(true));
-      assertEquals((Boolean) layer.getIconOptional().getValue(), (Boolean) true);
+    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);
+      }
     });
   }
 
@@ -392,26 +370,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-optional");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -420,12 +401,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotation-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP));
-      assertEquals((String) layer.getIconRotationAlignment().getValue(), (String) ICON_ROTATION_ALIGNMENT_MAP);
+    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);
+      }
     });
   }
 
@@ -434,26 +418,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotation-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -462,12 +449,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconSize(0.3f));
-      assertEquals((Float) layer.getIconSize().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -476,27 +466,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -505,20 +498,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -527,27 +523,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -556,30 +555,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconSize(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -589,35 +591,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-size");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -626,12 +631,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-text-fit");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconTextFit(ICON_TEXT_FIT_NONE));
-      assertEquals((String) layer.getIconTextFit().getValue(), (String) ICON_TEXT_FIT_NONE);
+    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);
+      }
     });
   }
 
@@ -640,26 +648,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-text-fit");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -668,12 +679,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-text-fit-padding");
-    invoke(mapboxMap, (uiController, 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});
+    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});
+      }
     });
   }
 
@@ -682,27 +696,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-text-fit-padding");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -711,12 +728,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-image");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconImage("undefined"));
-      assertEquals((String) layer.getIconImage().getValue(), (String) "undefined");
+    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");
+      }
     });
   }
 
@@ -725,26 +745,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-image");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -753,20 +776,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-image");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -775,27 +801,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-image");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -804,12 +833,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconRotate(0.3f));
-      assertEquals((Float) layer.getIconRotate().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -818,27 +850,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -847,20 +882,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -869,27 +907,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -898,30 +939,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconRotate(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -931,35 +975,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-rotate");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -968,12 +1015,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-padding");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconPadding(0.3f));
-      assertEquals((Float) layer.getIconPadding().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -982,27 +1032,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-padding");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1011,12 +1064,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-keep-upright");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconKeepUpright(true));
-      assertEquals((Boolean) layer.getIconKeepUpright().getValue(), (Boolean) true);
+    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);
+      }
     });
   }
 
@@ -1025,26 +1081,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-keep-upright");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1053,12 +1112,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconOffset(new Float[] {0f, 0f}));
-      assertEquals((Float[]) layer.getIconOffset().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(iconOffset(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getIconOffset().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
     });
   }
 
@@ -1067,27 +1129,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1096,20 +1161,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -1118,27 +1186,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1147,12 +1218,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconAnchor(ICON_ANCHOR_CENTER));
-      assertEquals((String) layer.getIconAnchor().getValue(), (String) ICON_ANCHOR_CENTER);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(iconAnchor(ICON_ANCHOR_CENTER));
+        assertEquals((String) layer.getIconAnchor().getValue(), (String) ICON_ANCHOR_CENTER);
+      }
     });
   }
 
@@ -1161,26 +1235,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconAnchor(
-          zoom(
-            interval(
-              stop(2, iconAnchor(ICON_ANCHOR_CENTER))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconAnchor(
+            zoom(
+              interval(
+                stop(2, iconAnchor(ICON_ANCHOR_CENTER))
+              )
             )
           )
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getIconAnchor());
-      assertNotNull(layer.getIconAnchor().getFunction());
-      assertEquals(CameraFunction.class, layer.getIconAnchor().getFunction().getClass());
-      assertEquals(IntervalStops.class, layer.getIconAnchor().getFunction().getStops().getClass());
-      assertEquals(1, ((IntervalStops) layer.getIconAnchor().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getIconAnchor());
+        assertNotNull(layer.getIconAnchor().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconAnchor().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getIconAnchor().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getIconAnchor().getFunction().getStops()).size());
+      }
     });
   }
 
@@ -1189,20 +1266,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconAnchor(property("FeaturePropertyA", Stops.<String>identity()))
-      );
-
-      // Verify
-      assertNotNull(layer.getIconAnchor());
-      assertNotNull(layer.getIconAnchor().getFunction());
-      assertEquals(SourceFunction.class, layer.getIconAnchor().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconAnchor().getFunction()).getProperty());
-      assertEquals(IdentityStops.class, layer.getIconAnchor().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconAnchor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getIconAnchor());
+        assertNotNull(layer.getIconAnchor().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconAnchor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconAnchor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getIconAnchor().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -1211,27 +1291,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconAnchor(
-          property(
-            "FeaturePropertyA",
-            interval(
-              stop(1, iconAnchor(ICON_ANCHOR_CENTER))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconAnchor(
+            property(
+              "FeaturePropertyA",
+              interval(
+                stop(1, iconAnchor(ICON_ANCHOR_CENTER))
+              )
             )
           )
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getIconAnchor());
-      assertNotNull(layer.getIconAnchor().getFunction());
-      assertEquals(SourceFunction.class, layer.getIconAnchor().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconAnchor().getFunction()).getProperty());
-      assertEquals(IntervalStops.class, layer.getIconAnchor().getFunction().getStops().getClass());
+        );
+
+        // Verify
+        assertNotNull(layer.getIconAnchor());
+        assertNotNull(layer.getIconAnchor().getFunction());
+        assertEquals(SourceFunction.class, layer.getIconAnchor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getIconAnchor().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.getIconAnchor().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -1240,12 +1323,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-pitch-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconPitchAlignment(ICON_PITCH_ALIGNMENT_MAP));
-      assertEquals((String) layer.getIconPitchAlignment().getValue(), (String) ICON_PITCH_ALIGNMENT_MAP);
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set and Get
+        layer.setProperties(iconPitchAlignment(ICON_PITCH_ALIGNMENT_MAP));
+        assertEquals((String) layer.getIconPitchAlignment().getValue(), (String) ICON_PITCH_ALIGNMENT_MAP);
+      }
     });
   }
 
@@ -1254,26 +1340,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-pitch-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconPitchAlignment(
-          zoom(
-            interval(
-              stop(2, iconPitchAlignment(ICON_PITCH_ALIGNMENT_MAP))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          iconPitchAlignment(
+            zoom(
+              interval(
+                stop(2, iconPitchAlignment(ICON_PITCH_ALIGNMENT_MAP))
+              )
             )
           )
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getIconPitchAlignment());
-      assertNotNull(layer.getIconPitchAlignment().getFunction());
-      assertEquals(CameraFunction.class, layer.getIconPitchAlignment().getFunction().getClass());
-      assertEquals(IntervalStops.class, layer.getIconPitchAlignment().getFunction().getStops().getClass());
-      assertEquals(1, ((IntervalStops) layer.getIconPitchAlignment().getFunction().getStops()).size());
+        );
+
+        // Verify
+        assertNotNull(layer.getIconPitchAlignment());
+        assertNotNull(layer.getIconPitchAlignment().getFunction());
+        assertEquals(CameraFunction.class, layer.getIconPitchAlignment().getFunction().getClass());
+        assertEquals(IntervalStops.class, layer.getIconPitchAlignment().getFunction().getStops().getClass());
+        assertEquals(1, ((IntervalStops) layer.getIconPitchAlignment().getFunction().getStops()).size());
+      }
     });
   }
 
@@ -1282,12 +1371,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-pitch-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textPitchAlignment(TEXT_PITCH_ALIGNMENT_MAP));
-      assertEquals((String) layer.getTextPitchAlignment().getValue(), (String) TEXT_PITCH_ALIGNMENT_MAP);
+    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);
+      }
     });
   }
 
@@ -1296,26 +1388,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-pitch-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1324,12 +1419,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotation-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textRotationAlignment(TEXT_ROTATION_ALIGNMENT_MAP));
-      assertEquals((String) layer.getTextRotationAlignment().getValue(), (String) TEXT_ROTATION_ALIGNMENT_MAP);
+    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);
+      }
     });
   }
 
@@ -1338,26 +1436,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotation-alignment");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1366,12 +1467,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-field");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textField(""));
-      assertEquals((String) layer.getTextField().getValue(), (String) "");
+    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) "");
+      }
     });
   }
 
@@ -1380,26 +1484,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-field");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1408,20 +1515,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-field");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -1430,27 +1540,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-field");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1459,12 +1572,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-font");
-    invoke(mapboxMap, (uiController, 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"});
+    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"});
+      }
     });
   }
 
@@ -1473,26 +1589,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-font");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1501,12 +1620,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textSize(0.3f));
-      assertEquals((Float) layer.getTextSize().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -1515,27 +1637,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1544,20 +1669,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -1566,27 +1694,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1595,30 +1726,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textSize(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -1628,35 +1762,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-size");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -1665,12 +1802,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textMaxWidth(0.3f));
-      assertEquals((Float) layer.getTextMaxWidth().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -1679,27 +1819,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1708,20 +1851,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textMaxWidth(property("FeaturePropertyA", Stops.<Float>identity()))
-      );
-
-      // Verify
-      assertNotNull(layer.getTextMaxWidth());
-      assertNotNull(layer.getTextMaxWidth().getFunction());
-      assertEquals(SourceFunction.class, layer.getTextMaxWidth().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextMaxWidth().getFunction()).getProperty());
-      assertEquals(IdentityStops.class, layer.getTextMaxWidth().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textMaxWidth(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getTextMaxWidth());
+        assertNotNull(layer.getTextMaxWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextMaxWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextMaxWidth().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextMaxWidth().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -1730,27 +1876,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textMaxWidth(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, 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(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, textMaxWidth(0.3f))
+              ).withBase(0.5f)
+            )
           )
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getTextMaxWidth());
-      assertNotNull(layer.getTextMaxWidth().getFunction());
-      assertEquals(SourceFunction.class, layer.getTextMaxWidth().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextMaxWidth().getFunction()).getProperty());
-      assertEquals(ExponentialStops.class, layer.getTextMaxWidth().getFunction().getStops().getClass());
+        );
+
+        // Verify
+        assertNotNull(layer.getTextMaxWidth());
+        assertNotNull(layer.getTextMaxWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextMaxWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextMaxWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextMaxWidth().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -1759,30 +1908,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textMaxWidth(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, textMaxWidth(0.3f))
-            )
-          ).withDefaultValue(textMaxWidth(0.3f))
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getTextMaxWidth());
-      assertNotNull(layer.getTextMaxWidth().getFunction());
-      assertEquals(SourceFunction.class, layer.getTextMaxWidth().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextMaxWidth().getFunction()).getProperty());
-      assertEquals(CategoricalStops.class, layer.getTextMaxWidth().getFunction().getStops().getClass());
-      assertNotNull(((SourceFunction) layer.getTextMaxWidth().getFunction()).getDefaultValue());
-      assertNotNull(((SourceFunction) layer.getTextMaxWidth().getFunction()).getDefaultValue().getValue());
-      assertEquals(0.3f, ((SourceFunction) layer.getTextMaxWidth().getFunction()).getDefaultValue().getValue());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textMaxWidth(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, textMaxWidth(0.3f))
+              )
+            ).withDefaultValue(textMaxWidth(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getTextMaxWidth());
+        assertNotNull(layer.getTextMaxWidth().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextMaxWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextMaxWidth().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getTextMaxWidth().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getTextMaxWidth().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getTextMaxWidth().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getTextMaxWidth().getFunction()).getDefaultValue().getValue());
+      }
     });
 
   }
@@ -1792,35 +1944,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textMaxWidth(
-          composite(
-            "FeaturePropertyA",
-            exponential(
-              stop(0, 0.3f, textMaxWidth(0.9f))
-            ).withBase(0.5f)
-          ).withDefaultValue(textMaxWidth(0.3f))
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getTextMaxWidth());
-      assertNotNull(layer.getTextMaxWidth().getFunction());
-      assertEquals(CompositeFunction.class, layer.getTextMaxWidth().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextMaxWidth().getFunction()).getProperty());
-      assertEquals(ExponentialStops.class, layer.getTextMaxWidth().getFunction().getStops().getClass());
-      assertEquals(1, ((ExponentialStops) layer.getTextMaxWidth().getFunction().getStops()).size());
-
-      ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-        (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextMaxWidth().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(
+          textMaxWidth(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, textMaxWidth(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(textMaxWidth(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getTextMaxWidth());
+        assertNotNull(layer.getTextMaxWidth().getFunction());
+        assertEquals(CompositeFunction.class, layer.getTextMaxWidth().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextMaxWidth().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextMaxWidth().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getTextMaxWidth().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextMaxWidth().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);
+      }
     });
   }
 
@@ -1829,12 +1984,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-line-height");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textLineHeight(0.3f));
-      assertEquals((Float) layer.getTextLineHeight().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -1843,27 +2001,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-line-height");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1872,12 +2033,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-letter-spacing");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textLetterSpacing(0.3f));
-      assertEquals((Float) layer.getTextLetterSpacing().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -1886,27 +2050,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-letter-spacing");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -1915,20 +2082,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-letter-spacing");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textLetterSpacing(property("FeaturePropertyA", Stops.<Float>identity()))
-      );
-
-      // Verify
-      assertNotNull(layer.getTextLetterSpacing());
-      assertNotNull(layer.getTextLetterSpacing().getFunction());
-      assertEquals(SourceFunction.class, layer.getTextLetterSpacing().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextLetterSpacing().getFunction()).getProperty());
-      assertEquals(IdentityStops.class, layer.getTextLetterSpacing().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textLetterSpacing(property("FeaturePropertyA", Stops.<Float>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getTextLetterSpacing());
+        assertNotNull(layer.getTextLetterSpacing().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextLetterSpacing().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextLetterSpacing().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextLetterSpacing().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -1937,27 +2107,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-letter-spacing");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textLetterSpacing(
-          property(
-            "FeaturePropertyA",
-            exponential(
-              stop(0.3f, 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(
+            property(
+              "FeaturePropertyA",
+              exponential(
+                stop(0.3f, textLetterSpacing(0.3f))
+              ).withBase(0.5f)
+            )
           )
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getTextLetterSpacing());
-      assertNotNull(layer.getTextLetterSpacing().getFunction());
-      assertEquals(SourceFunction.class, layer.getTextLetterSpacing().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextLetterSpacing().getFunction()).getProperty());
-      assertEquals(ExponentialStops.class, layer.getTextLetterSpacing().getFunction().getStops().getClass());
+        );
+
+        // Verify
+        assertNotNull(layer.getTextLetterSpacing());
+        assertNotNull(layer.getTextLetterSpacing().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextLetterSpacing().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextLetterSpacing().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextLetterSpacing().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -1966,30 +2139,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-letter-spacing");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textLetterSpacing(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, textLetterSpacing(0.3f))
-            )
-          ).withDefaultValue(textLetterSpacing(0.3f))
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getTextLetterSpacing());
-      assertNotNull(layer.getTextLetterSpacing().getFunction());
-      assertEquals(SourceFunction.class, layer.getTextLetterSpacing().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextLetterSpacing().getFunction()).getProperty());
-      assertEquals(CategoricalStops.class, layer.getTextLetterSpacing().getFunction().getStops().getClass());
-      assertNotNull(((SourceFunction) layer.getTextLetterSpacing().getFunction()).getDefaultValue());
-      assertNotNull(((SourceFunction) layer.getTextLetterSpacing().getFunction()).getDefaultValue().getValue());
-      assertEquals(0.3f, ((SourceFunction) layer.getTextLetterSpacing().getFunction()).getDefaultValue().getValue());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textLetterSpacing(
+            property(
+              "FeaturePropertyA",
+              categorical(
+                stop(1.0f, textLetterSpacing(0.3f))
+              )
+            ).withDefaultValue(textLetterSpacing(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getTextLetterSpacing());
+        assertNotNull(layer.getTextLetterSpacing().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextLetterSpacing().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextLetterSpacing().getFunction()).getProperty());
+        assertEquals(CategoricalStops.class, layer.getTextLetterSpacing().getFunction().getStops().getClass());
+        assertNotNull(((SourceFunction) layer.getTextLetterSpacing().getFunction()).getDefaultValue());
+        assertNotNull(((SourceFunction) layer.getTextLetterSpacing().getFunction()).getDefaultValue().getValue());
+        assertEquals(0.3f, ((SourceFunction) layer.getTextLetterSpacing().getFunction()).getDefaultValue().getValue());
+      }
     });
 
   }
@@ -1999,35 +2175,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-letter-spacing");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textLetterSpacing(
-          composite(
-            "FeaturePropertyA",
-            exponential(
-              stop(0, 0.3f, textLetterSpacing(0.9f))
-            ).withBase(0.5f)
-          ).withDefaultValue(textLetterSpacing(0.3f))
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getTextLetterSpacing());
-      assertNotNull(layer.getTextLetterSpacing().getFunction());
-      assertEquals(CompositeFunction.class, layer.getTextLetterSpacing().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextLetterSpacing().getFunction()).getProperty());
-      assertEquals(ExponentialStops.class, layer.getTextLetterSpacing().getFunction().getStops().getClass());
-      assertEquals(1, ((ExponentialStops) layer.getTextLetterSpacing().getFunction().getStops()).size());
-
-      ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-        (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextLetterSpacing().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(
+          textLetterSpacing(
+            composite(
+              "FeaturePropertyA",
+              exponential(
+                stop(0, 0.3f, textLetterSpacing(0.9f))
+              ).withBase(0.5f)
+            ).withDefaultValue(textLetterSpacing(0.3f))
+          )
+        );
+
+        // Verify
+        assertNotNull(layer.getTextLetterSpacing());
+        assertNotNull(layer.getTextLetterSpacing().getFunction());
+        assertEquals(CompositeFunction.class, layer.getTextLetterSpacing().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getTextLetterSpacing().getFunction()).getProperty());
+        assertEquals(ExponentialStops.class, layer.getTextLetterSpacing().getFunction().getStops().getClass());
+        assertEquals(1, ((ExponentialStops) layer.getTextLetterSpacing().getFunction().getStops()).size());
+
+        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
+          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getTextLetterSpacing().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);
+      }
     });
   }
 
@@ -2036,12 +2215,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-justify");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textJustify(TEXT_JUSTIFY_LEFT));
-      assertEquals((String) layer.getTextJustify().getValue(), (String) TEXT_JUSTIFY_LEFT);
+    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);
+      }
     });
   }
 
@@ -2050,26 +2232,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-justify");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2078,20 +2263,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-justify");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textJustify(property("FeaturePropertyA", Stops.<String>identity()))
-      );
-
-      // Verify
-      assertNotNull(layer.getTextJustify());
-      assertNotNull(layer.getTextJustify().getFunction());
-      assertEquals(SourceFunction.class, layer.getTextJustify().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextJustify().getFunction()).getProperty());
-      assertEquals(IdentityStops.class, layer.getTextJustify().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textJustify(property("FeaturePropertyA", Stops.<String>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getTextJustify());
+        assertNotNull(layer.getTextJustify().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextJustify().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextJustify().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextJustify().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -2100,27 +2288,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-justify");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textJustify(
-          property(
-            "FeaturePropertyA",
-            interval(
-              stop(1, textJustify(TEXT_JUSTIFY_LEFT))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textJustify(
+            property(
+              "FeaturePropertyA",
+              interval(
+                stop(1, textJustify(TEXT_JUSTIFY_LEFT))
+              )
             )
           )
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getTextJustify());
-      assertNotNull(layer.getTextJustify().getFunction());
-      assertEquals(SourceFunction.class, layer.getTextJustify().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextJustify().getFunction()).getProperty());
-      assertEquals(IntervalStops.class, layer.getTextJustify().getFunction().getStops().getClass());
+        );
+
+        // Verify
+        assertNotNull(layer.getTextJustify());
+        assertNotNull(layer.getTextJustify().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextJustify().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextJustify().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.getTextJustify().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -2129,12 +2320,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textAnchor(TEXT_ANCHOR_CENTER));
-      assertEquals((String) layer.getTextAnchor().getValue(), (String) TEXT_ANCHOR_CENTER);
+    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);
+      }
     });
   }
 
@@ -2143,26 +2337,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2171,20 +2368,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textAnchor(property("FeaturePropertyA", Stops.<String>identity()))
-      );
-
-      // Verify
-      assertNotNull(layer.getTextAnchor());
-      assertNotNull(layer.getTextAnchor().getFunction());
-      assertEquals(SourceFunction.class, layer.getTextAnchor().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextAnchor().getFunction()).getProperty());
-      assertEquals(IdentityStops.class, layer.getTextAnchor().getFunction().getStops().getClass());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textAnchor(property("FeaturePropertyA", Stops.<String>identity()))
+        );
+
+        // Verify
+        assertNotNull(layer.getTextAnchor());
+        assertNotNull(layer.getTextAnchor().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextAnchor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextAnchor().getFunction()).getProperty());
+        assertEquals(IdentityStops.class, layer.getTextAnchor().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -2193,27 +2393,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textAnchor(
-          property(
-            "FeaturePropertyA",
-            interval(
-              stop(1, textAnchor(TEXT_ANCHOR_CENTER))
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // Set
+        layer.setProperties(
+          textAnchor(
+            property(
+              "FeaturePropertyA",
+              interval(
+                stop(1, textAnchor(TEXT_ANCHOR_CENTER))
+              )
             )
           )
-        )
-      );
-
-      // Verify
-      assertNotNull(layer.getTextAnchor());
-      assertNotNull(layer.getTextAnchor().getFunction());
-      assertEquals(SourceFunction.class, layer.getTextAnchor().getFunction().getClass());
-      assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextAnchor().getFunction()).getProperty());
-      assertEquals(IntervalStops.class, layer.getTextAnchor().getFunction().getStops().getClass());
+        );
+
+        // Verify
+        assertNotNull(layer.getTextAnchor());
+        assertNotNull(layer.getTextAnchor().getFunction());
+        assertEquals(SourceFunction.class, layer.getTextAnchor().getFunction().getClass());
+        assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextAnchor().getFunction()).getProperty());
+        assertEquals(IntervalStops.class, layer.getTextAnchor().getFunction().getStops().getClass());
+      }
     });
   }
 
@@ -2222,12 +2425,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-angle");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textMaxAngle(0.3f));
-      assertEquals((Float) layer.getTextMaxAngle().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -2236,27 +2442,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-max-angle");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2265,12 +2474,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textRotate(0.3f));
-      assertEquals((Float) layer.getTextRotate().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -2279,27 +2491,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2308,20 +2523,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -2330,27 +2548,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2359,30 +2580,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textRotate(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -2392,35 +2616,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-rotate");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -2429,12 +2656,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-padding");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textPadding(0.3f));
-      assertEquals((Float) layer.getTextPadding().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -2443,27 +2673,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-padding");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2472,12 +2705,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-keep-upright");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textKeepUpright(true));
-      assertEquals((Boolean) layer.getTextKeepUpright().getValue(), (Boolean) true);
+    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);
+      }
     });
   }
 
@@ -2486,26 +2722,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-keep-upright");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2514,12 +2753,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-transform");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textTransform(TEXT_TRANSFORM_NONE));
-      assertEquals((String) layer.getTextTransform().getValue(), (String) TEXT_TRANSFORM_NONE);
+    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);
+      }
     });
   }
 
@@ -2528,26 +2770,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-transform");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2556,20 +2801,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-transform");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -2578,27 +2826,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-transform");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2607,12 +2858,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textOffset(new Float[] {0f, 0f}));
-      assertEquals((Float[]) layer.getTextOffset().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(textOffset(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getTextOffset().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
     });
   }
 
@@ -2621,27 +2875,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2650,20 +2907,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -2672,27 +2932,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-offset");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2701,12 +2964,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-allow-overlap");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textAllowOverlap(true));
-      assertEquals((Boolean) layer.getTextAllowOverlap().getValue(), (Boolean) true);
+    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);
+      }
     });
   }
 
@@ -2715,26 +2981,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-allow-overlap");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2743,12 +3012,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-ignore-placement");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textIgnorePlacement(true));
-      assertEquals((Boolean) layer.getTextIgnorePlacement().getValue(), (Boolean) true);
+    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);
+      }
     });
   }
 
@@ -2757,26 +3029,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-ignore-placement");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2785,12 +3060,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-optional");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textOptional(true));
-      assertEquals((Boolean) layer.getTextOptional().getValue(), (Boolean) true);
+    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);
+      }
     });
   }
 
@@ -2799,26 +3077,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-optional");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2827,13 +3108,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setIconOpacityTransition(options);
-      assertEquals(layer.getIconOpacityTransition(), 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.setIconOpacityTransition(options);
+        assertEquals(layer.getIconOpacityTransition(), options);
+      }
     });
   }
 
@@ -2842,12 +3126,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconOpacity(0.3f));
-      assertEquals((Float) layer.getIconOpacity().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -2856,27 +3143,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2885,20 +3175,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -2907,27 +3200,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -2936,30 +3232,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconOpacity(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -2969,35 +3268,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-opacity");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -3006,13 +3308,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setIconColorTransition(options);
-      assertEquals(layer.getIconColorTransition(), 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.setIconColorTransition(options);
+        assertEquals(layer.getIconColorTransition(), options);
+      }
     });
   }
 
@@ -3021,12 +3326,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -3035,27 +3343,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3064,20 +3375,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -3086,27 +3400,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3115,30 +3432,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconColor(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop("valueA", iconColor(Color.RED))
-            )
-          ).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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -3148,12 +3468,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconColor(Color.RED));
-      assertEquals(layer.getIconColorAsInt(), Color.RED);
+    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);
+      }
     });
   }
 
@@ -3162,13 +3485,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setIconHaloColorTransition(options);
-      assertEquals(layer.getIconHaloColorTransition(), 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.setIconHaloColorTransition(options);
+        assertEquals(layer.getIconHaloColorTransition(), options);
+      }
     });
   }
 
@@ -3177,12 +3503,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -3191,27 +3520,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3220,20 +3552,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -3242,27 +3577,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3271,30 +3609,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconHaloColor(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop("valueA", iconHaloColor(Color.RED))
-            )
-          ).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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -3304,12 +3645,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconHaloColor(Color.RED));
-      assertEquals(layer.getIconHaloColorAsInt(), Color.RED);
+    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);
+      }
     });
   }
 
@@ -3318,13 +3662,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-widthTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setIconHaloWidthTransition(options);
-      assertEquals(layer.getIconHaloWidthTransition(), 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.setIconHaloWidthTransition(options);
+        assertEquals(layer.getIconHaloWidthTransition(), options);
+      }
     });
   }
 
@@ -3333,12 +3680,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconHaloWidth(0.3f));
-      assertEquals((Float) layer.getIconHaloWidth().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -3347,27 +3697,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3376,20 +3729,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -3398,27 +3754,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3427,30 +3786,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconHaloWidth(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -3460,35 +3822,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-width");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -3497,13 +3862,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blurTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setIconHaloBlurTransition(options);
-      assertEquals(layer.getIconHaloBlurTransition(), 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.setIconHaloBlurTransition(options);
+        assertEquals(layer.getIconHaloBlurTransition(), options);
+      }
     });
   }
 
@@ -3512,12 +3880,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconHaloBlur(0.3f));
-      assertEquals((Float) layer.getIconHaloBlur().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -3526,27 +3897,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3555,20 +3929,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -3577,27 +3954,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3606,30 +3986,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        iconHaloBlur(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -3639,35 +4022,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-halo-blur");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -3676,13 +4062,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-translateTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setIconTranslateTransition(options);
-      assertEquals(layer.getIconTranslateTransition(), 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.setIconTranslateTransition(options);
+        assertEquals(layer.getIconTranslateTransition(), options);
+      }
     });
   }
 
@@ -3691,12 +4080,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconTranslate(new Float[] {0f, 0f}));
-      assertEquals((Float[]) layer.getIconTranslate().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(iconTranslate(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getIconTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
     });
   }
 
@@ -3705,27 +4097,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3734,12 +4129,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(iconTranslateAnchor(ICON_TRANSLATE_ANCHOR_MAP));
-      assertEquals((String) layer.getIconTranslateAnchor().getValue(), (String) ICON_TRANSLATE_ANCHOR_MAP);
+    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);
+      }
     });
   }
 
@@ -3748,26 +4146,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("icon-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3776,13 +4177,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacityTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setTextOpacityTransition(options);
-      assertEquals(layer.getTextOpacityTransition(), 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.setTextOpacityTransition(options);
+        assertEquals(layer.getTextOpacityTransition(), options);
+      }
     });
   }
 
@@ -3791,12 +4195,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textOpacity(0.3f));
-      assertEquals((Float) layer.getTextOpacity().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -3805,27 +4212,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3834,20 +4244,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -3856,27 +4269,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -3885,30 +4301,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textOpacity(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -3918,35 +4337,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-opacity");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -3955,13 +4377,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setTextColorTransition(options);
-      assertEquals(layer.getTextColorTransition(), 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.setTextColorTransition(options);
+        assertEquals(layer.getTextColorTransition(), options);
+      }
     });
   }
 
@@ -3970,12 +4395,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -3984,27 +4412,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -4013,20 +4444,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -4035,27 +4469,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -4064,30 +4501,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textColor(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop("valueA", textColor(Color.RED))
-            )
-          ).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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -4097,12 +4537,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textColor(Color.RED));
-      assertEquals(layer.getTextColorAsInt(), Color.RED);
+    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);
+      }
     });
   }
 
@@ -4111,13 +4554,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-colorTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setTextHaloColorTransition(options);
-      assertEquals(layer.getTextHaloColorTransition(), 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.setTextHaloColorTransition(options);
+        assertEquals(layer.getTextHaloColorTransition(), options);
+      }
     });
   }
 
@@ -4126,12 +4572,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    invoke(mapboxMap, (uiController, 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)");
+    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)");
+      }
     });
   }
 
@@ -4140,27 +4589,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -4169,20 +4621,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -4191,27 +4646,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -4220,30 +4678,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textHaloColor(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop("valueA", textHaloColor(Color.RED))
-            )
-          ).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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -4253,12 +4714,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-color");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textHaloColor(Color.RED));
-      assertEquals(layer.getTextHaloColorAsInt(), Color.RED);
+    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);
+      }
     });
   }
 
@@ -4267,13 +4731,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-widthTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setTextHaloWidthTransition(options);
-      assertEquals(layer.getTextHaloWidthTransition(), 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.setTextHaloWidthTransition(options);
+        assertEquals(layer.getTextHaloWidthTransition(), options);
+      }
     });
   }
 
@@ -4282,12 +4749,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textHaloWidth(0.3f));
-      assertEquals((Float) layer.getTextHaloWidth().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -4296,27 +4766,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -4325,20 +4798,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -4347,27 +4823,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -4376,30 +4855,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textHaloWidth(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -4409,35 +4891,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-width");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -4446,13 +4931,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blurTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setTextHaloBlurTransition(options);
-      assertEquals(layer.getTextHaloBlurTransition(), 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.setTextHaloBlurTransition(options);
+        assertEquals(layer.getTextHaloBlurTransition(), options);
+      }
     });
   }
 
@@ -4461,12 +4949,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textHaloBlur(0.3f));
-      assertEquals((Float) layer.getTextHaloBlur().getValue(), (Float) 0.3f);
+    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);
+      }
     });
   }
 
@@ -4475,27 +4966,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -4504,20 +4998,23 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // 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());
+    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
+      @Override
+      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
+        assertNotNull(layer);
+
+        // 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());
+      }
     });
   }
 
@@ -4526,27 +5023,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -4555,30 +5055,33 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textHaloBlur(
-          property(
-            "FeaturePropertyA",
-            categorical(
-              stop(1.0f, 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());
+    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))
+          )
+        );
+
+        // 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());
+      }
     });
 
   }
@@ -4588,35 +5091,38 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-halo-blur");
-    invoke(mapboxMap, (uiController, 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);
+    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);
+      }
     });
   }
 
@@ -4625,13 +5131,16 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-translateTransitionOptions");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      TransitionOptions options = new TransitionOptions(300, 100);
-      layer.setTextTranslateTransition(options);
-      assertEquals(layer.getTextTranslateTransition(), 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.setTextTranslateTransition(options);
+        assertEquals(layer.getTextTranslateTransition(), options);
+      }
     });
   }
 
@@ -4640,12 +5149,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textTranslate(new Float[] {0f, 0f}));
-      assertEquals((Float[]) layer.getTextTranslate().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(textTranslate(new Float[] {0f, 0f}));
+        assertEquals((Float[]) layer.getTextTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      }
     });
   }
 
@@ -4654,27 +5166,30 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-translate");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      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());
+      }
     });
   }
 
@@ -4683,12 +5198,15 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set and Get
-      layer.setProperties(textTranslateAnchor(TEXT_TRANSLATE_ANCHOR_MAP));
-      assertEquals((String) layer.getTextTranslateAnchor().getValue(), (String) TEXT_TRANSLATE_ANCHOR_MAP);
+    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);
+      }
     });
   }
 
@@ -4697,26 +5215,29 @@ public class SymbolLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("text-translate-anchor");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-
-      // Set
-      layer.setProperties(
-        textTranslateAnchor(
-          zoom(
-            interval(
-              stop(2, textTranslateAnchor(TEXT_TRANSLATE_ANCHOR_MAP))
+    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());
+        );
+
+        // 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/src/style/layers/raster_layer.cpp b/platform/android/src/style/layers/raster_layer.cpp
index 98923d5129..6d36298bb1 100644
--- a/platform/android/src/style/layers/raster_layer.cpp
+++ b/platform/android/src/style/layers/raster_layer.cpp
@@ -155,19 +155,6 @@ namespace android {
         return jni::Object<jni::ObjectTag>(*converted);
     }
 
-    jni::Object<TransitionOptions> RasterLayer::getRasterFadeDurationTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = layer.as<mbgl::style::RasterLayer>()->RasterLayer::getRasterFadeDurationTransition();
-        return *convert<jni::Object<TransitionOptions>>(env, options);
-    }
-
-    void RasterLayer::setRasterFadeDurationTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        layer.as<mbgl::style::RasterLayer>()->RasterLayer::setRasterFadeDurationTransition(options);
-    }
-
 
     jni::Class<RasterLayer> RasterLayer::javaClass;
 
@@ -206,8 +193,6 @@ namespace android {
             METHOD(&RasterLayer::getRasterContrastTransition, "nativeGetRasterContrastTransition"),
             METHOD(&RasterLayer::setRasterContrastTransition, "nativeSetRasterContrastTransition"),
             METHOD(&RasterLayer::getRasterContrast, "nativeGetRasterContrast"),
-            METHOD(&RasterLayer::getRasterFadeDurationTransition, "nativeGetRasterFadeDurationTransition"),
-            METHOD(&RasterLayer::setRasterFadeDurationTransition, "nativeSetRasterFadeDurationTransition"),
             METHOD(&RasterLayer::getRasterFadeDuration, "nativeGetRasterFadeDuration"));
     }
 
diff --git a/platform/android/src/style/layers/raster_layer.hpp b/platform/android/src/style/layers/raster_layer.hpp
index 3b119ee0d2..ed6fc3e1b2 100644
--- a/platform/android/src/style/layers/raster_layer.hpp
+++ b/platform/android/src/style/layers/raster_layer.hpp
@@ -54,8 +54,6 @@ public:
     jni::Object<TransitionOptions> getRasterContrastTransition(jni::JNIEnv&);
 
     jni::Object<jni::ObjectTag> getRasterFadeDuration(jni::JNIEnv&);
-    void setRasterFadeDurationTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Object<TransitionOptions> getRasterFadeDurationTransition(jni::JNIEnv&);
     jni::jobject* createJavaPeer(jni::JNIEnv&);
 
 }; // class RasterLayer