1 files changed, 224 insertions, 1378 deletions

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 559e446307..a851fde6dd 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,31 +3,18 @@
 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.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
-import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static com.mapbox.mapboxsdk.style.functions.Function.*;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
+import static com.mapbox.mapboxsdk.style.expressions.Expression.*;
 import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
@@ -51,17 +38,14 @@ public class CircleLayerTest extends BaseActivityTest {
 
   private void setupLayer() {
     Timber.i("Retrieving layer");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-          Timber.i("Adding layer");
-          layer = new CircleLayer("my-layer", "composite");
-          layer.setSourceLayer("composite");
-          mapboxMap.addLayer(layer);
-          // Layer reference is now stale, get new reference
-          layer = mapboxMap.getLayerAs("my-layer");
-        }
+    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");
       }
     });
   }
@@ -71,18 +55,15 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
+    invoke(mapboxMap, (uiController, 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);
     });
   }
 
@@ -91,237 +72,96 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("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);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleRadiusTransition() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-radiusTransitionOptions");
-    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);
-      }
-    });
-  }
+      // Get initial
+      assertEquals(layer.getSourceLayer(), "composite");
 
-  @Test
-  public void testCircleRadiusAsConstant() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-radius");
-    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);
-      }
+      // Set
+      final String sourceLayer = "test";
+      layer.setSourceLayer(sourceLayer);
+      assertEquals(layer.getSourceLayer(), sourceLayer);
     });
   }
 
   @Test
-  public void testCircleRadiusAsCameraFunction() {
+  public void testFilter() {
     validateTestSetup();
     setupLayer();
-    Timber.i("circle-radius");
-    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());
-      }
-    });
-  }
+    Timber.i("Filter");
+    invoke(mapboxMap, (uiController, mapboxMap1) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleRadiusAsIdentitySourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-radius");
-    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());
-      }
+      // Get initial
+      assertEquals(layer.getFilter(), null);
+
+      // Set
+      Expression filter = eq(get("undefined"), literal(1.0));
+      layer.setFilter(filter);
+      assertEquals(layer.getFilter().toString(), filter.toString());
     });
   }
 
+
+
   @Test
-  public void testCircleRadiusAsExponentialSourceFunction() {
+  public void testCircleRadiusTransition() {
     validateTestSetup();
     setupLayer();
-    Timber.i("circle-radius");
-    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());
-      }
+    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);
     });
   }
 
   @Test
-  public void testCircleRadiusAsCategoricalSourceFunction() {
+  public void testCircleRadiusAsConstant() {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-radius");
-    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());
-      }
-    });
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
+      // Set and Get
+      layer.setProperties(circleRadius(0.3f));
+      assertEquals((Float) layer.getCircleRadius().getValue(), (Float) 0.3f);
+    });
   }
 
   @Test
-  public void testCircleRadiusAsCompositeFunction() {
+  public void testCircleRadiusAsExpression() {
     validateTestSetup();
     setupLayer();
-    Timber.i("circle-radius");
-    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);
-      }
+    Timber.i("circle-radius-expression");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      Expression expression = number(Expression.get("undefined"));
+      layer.setProperties(circleRadius(expression));
+      assertEquals(layer.getCircleRadius().getExpression(), expression);
     });
   }
 
+
   @Test
   public void testCircleColorTransition() {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-colorTransitionOptions");
-    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);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setCircleColorTransition(options);
+      assertEquals(layer.getCircleColorTransition(), options);
     });
   }
 
@@ -330,157 +170,42 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    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)");
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleColorAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-color");
-    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());
-      }
+      // Set and Get
+      layer.setProperties(circleColor("rgba(0, 0, 0, 1)"));
+      assertEquals((String) layer.getCircleColor().getValue(), (String) "rgba(0, 0, 0, 1)");
     });
   }
 
   @Test
-  public void testCircleColorAsIdentitySourceFunction() {
+  public void testCircleColorAsExpression() {
     validateTestSetup();
     setupLayer();
-    Timber.i("circle-color");
-    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());
-      }
-    });
-  }
+    Timber.i("circle-color-expression");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleColorAsExponentialSourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-color");
-    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());
-      }
+      // Set and Get
+      Expression expression = toColor(Expression.get("undefined"));
+      layer.setProperties(circleColor(expression));
+      assertEquals(layer.getCircleColor().getExpression(), expression);
     });
   }
 
-  @Test
-  public void testCircleColorAsCategoricalSourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-color");
-    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());
-      }
-    });
-
-  }
 
   @Test
   public void testCircleColorAsIntConstant() {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-color");
-    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);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      layer.setProperties(circleColor(Color.RED));
+      assertEquals(layer.getCircleColorAsInt(), Color.RED);
     });
   }
 
@@ -489,16 +214,13 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blurTransitionOptions");
-    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);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setCircleBlurTransition(options);
+      assertEquals(layer.getCircleBlurTransition(), options);
     });
   }
 
@@ -507,398 +229,88 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-blur");
-    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);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleBlurAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-blur");
-    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());
-      }
+      // Set and Get
+      layer.setProperties(circleBlur(0.3f));
+      assertEquals((Float) layer.getCircleBlur().getValue(), (Float) 0.3f);
     });
   }
 
   @Test
-  public void testCircleBlurAsIdentitySourceFunction() {
+  public void testCircleBlurAsExpression() {
     validateTestSetup();
     setupLayer();
-    Timber.i("circle-blur");
-    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());
-      }
-    });
-  }
+    Timber.i("circle-blur-expression");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleBlurAsExponentialSourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-blur");
-    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());
-      }
+      // Set and Get
+      Expression expression = number(Expression.get("undefined"));
+      layer.setProperties(circleBlur(expression));
+      assertEquals(layer.getCircleBlur().getExpression(), expression);
     });
   }
 
-  @Test
-  public void testCircleBlurAsCategoricalSourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-blur");
-    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());
-      }
-    });
-
-  }
-
-  @Test
-  public void testCircleBlurAsCompositeFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-blur");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          circleBlur(
-            composite(
-              "FeaturePropertyA",
-              exponential(
-                stop(0, 0.3f, circleBlur(0.9f))
-              ).withBase(0.5f)
-            ).withDefaultValue(circleBlur(0.3f))
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getCircleBlur());
-        assertNotNull(layer.getCircleBlur().getFunction());
-        assertEquals(CompositeFunction.class, layer.getCircleBlur().getFunction().getClass());
-        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleBlur().getFunction()).getProperty());
-        assertEquals(ExponentialStops.class, layer.getCircleBlur().getFunction().getStops().getClass());
-        assertEquals(1, ((ExponentialStops) layer.getCircleBlur().getFunction().getStops()).size());
-
-        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleBlur().getFunction().getStops();
-        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-        assertEquals(0f, stop.in.zoom, 0.001);
-        assertEquals(0.3f, stop.in.value, 0.001f);
-        assertEquals(0.9f, stop.out, 0.001f);
-      }
-    });
-  }
 
   @Test
   public void testCircleOpacityTransition() {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacityTransitionOptions");
-    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);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleOpacityAsConstant() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-opacity");
-    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);
-      }
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setCircleOpacityTransition(options);
+      assertEquals(layer.getCircleOpacityTransition(), options);
     });
   }
 
   @Test
-  public void testCircleOpacityAsCameraFunction() {
+  public void testCircleOpacityAsConstant() {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-opacity");
-    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());
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleOpacityAsIdentitySourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-opacity");
-    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());
-      }
+      // Set and Get
+      layer.setProperties(circleOpacity(0.3f));
+      assertEquals((Float) layer.getCircleOpacity().getValue(), (Float) 0.3f);
     });
   }
 
   @Test
-  public void testCircleOpacityAsExponentialSourceFunction() {
+  public void testCircleOpacityAsExpression() {
     validateTestSetup();
     setupLayer();
-    Timber.i("circle-opacity");
-    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());
-      }
-    });
-  }
+    Timber.i("circle-opacity-expression");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleOpacityAsCategoricalSourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-opacity");
-    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());
-      }
+      // Set and Get
+      Expression expression = number(Expression.get("undefined"));
+      layer.setProperties(circleOpacity(expression));
+      assertEquals(layer.getCircleOpacity().getExpression(), expression);
     });
-
   }
 
-  @Test
-  public void testCircleOpacityAsCompositeFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-opacity");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          circleOpacity(
-            composite(
-              "FeaturePropertyA",
-              exponential(
-                stop(0, 0.3f, circleOpacity(0.9f))
-              ).withBase(0.5f)
-            ).withDefaultValue(circleOpacity(0.3f))
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getCircleOpacity());
-        assertNotNull(layer.getCircleOpacity().getFunction());
-        assertEquals(CompositeFunction.class, layer.getCircleOpacity().getFunction().getClass());
-        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleOpacity().getFunction()).getProperty());
-        assertEquals(ExponentialStops.class, layer.getCircleOpacity().getFunction().getStops().getClass());
-        assertEquals(1, ((ExponentialStops) layer.getCircleOpacity().getFunction().getStops()).size());
-
-        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleOpacity().getFunction().getStops();
-        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-        assertEquals(0f, stop.in.zoom, 0.001);
-        assertEquals(0.3f, stop.in.value, 0.001f);
-        assertEquals(0.9f, stop.out, 0.001f);
-      }
-    });
-  }
 
   @Test
   public void testCircleTranslateTransition() {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translateTransitionOptions");
-    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);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setCircleTranslateTransition(options);
+      assertEquals(layer.getCircleTranslateTransition(), options);
     });
   }
 
@@ -907,47 +319,12 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translate");
-    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});
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleTranslateAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-translate");
-    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());
-      }
+      // Set and Get
+      layer.setProperties(circleTranslate(new Float[] {0f, 0f}));
+      assertEquals((Float[]) layer.getCircleTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
     });
   }
 
@@ -956,46 +333,12 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-translate-anchor");
-    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);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleTranslateAnchorAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-translate-anchor");
-    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());
-      }
+      // Set and Get
+      layer.setProperties(circleTranslateAnchor(CIRCLE_TRANSLATE_ANCHOR_MAP));
+      assertEquals((String) layer.getCircleTranslateAnchor().getValue(), (String) CIRCLE_TRANSLATE_ANCHOR_MAP);
     });
   }
 
@@ -1004,46 +347,12 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-pitch-scale");
-    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);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCirclePitchScaleAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-pitch-scale");
-    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());
-      }
+      // Set and Get
+      layer.setProperties(circlePitchScale(CIRCLE_PITCH_SCALE_MAP));
+      assertEquals((String) layer.getCirclePitchScale().getValue(), (String) CIRCLE_PITCH_SCALE_MAP);
     });
   }
 
@@ -1052,46 +361,12 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-pitch-alignment");
-    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);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCirclePitchAlignmentAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-pitch-alignment");
-    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());
-      }
+      // Set and Get
+      layer.setProperties(circlePitchAlignment(CIRCLE_PITCH_ALIGNMENT_MAP));
+      assertEquals((String) layer.getCirclePitchAlignment().getValue(), (String) CIRCLE_PITCH_ALIGNMENT_MAP);
     });
   }
 
@@ -1100,216 +375,58 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-widthTransitionOptions");
-    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);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleStrokeWidthAsConstant() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-width");
-    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);
-      }
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setCircleStrokeWidthTransition(options);
+      assertEquals(layer.getCircleStrokeWidthTransition(), options);
     });
   }
 
   @Test
-  public void testCircleStrokeWidthAsCameraFunction() {
+  public void testCircleStrokeWidthAsConstant() {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-width");
-    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());
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleStrokeWidthAsIdentitySourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-width");
-    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());
-      }
+      // Set and Get
+      layer.setProperties(circleStrokeWidth(0.3f));
+      assertEquals((Float) layer.getCircleStrokeWidth().getValue(), (Float) 0.3f);
     });
   }
 
   @Test
-  public void testCircleStrokeWidthAsExponentialSourceFunction() {
+  public void testCircleStrokeWidthAsExpression() {
     validateTestSetup();
     setupLayer();
-    Timber.i("circle-stroke-width");
-    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());
-      }
-    });
-  }
+    Timber.i("circle-stroke-width-expression");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleStrokeWidthAsCategoricalSourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-width");
-    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());
-      }
+      // Set and Get
+      Expression expression = number(Expression.get("undefined"));
+      layer.setProperties(circleStrokeWidth(expression));
+      assertEquals(layer.getCircleStrokeWidth().getExpression(), expression);
     });
-
   }
 
-  @Test
-  public void testCircleStrokeWidthAsCompositeFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-width");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          circleStrokeWidth(
-            composite(
-              "FeaturePropertyA",
-              exponential(
-                stop(0, 0.3f, circleStrokeWidth(0.9f))
-              ).withBase(0.5f)
-            ).withDefaultValue(circleStrokeWidth(0.3f))
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getCircleStrokeWidth());
-        assertNotNull(layer.getCircleStrokeWidth().getFunction());
-        assertEquals(CompositeFunction.class, layer.getCircleStrokeWidth().getFunction().getClass());
-        assertEquals("FeaturePropertyA", ((CompositeFunction) layer.getCircleStrokeWidth().getFunction()).getProperty());
-        assertEquals(ExponentialStops.class, layer.getCircleStrokeWidth().getFunction().getStops().getClass());
-        assertEquals(1, ((ExponentialStops) layer.getCircleStrokeWidth().getFunction().getStops()).size());
-
-        ExponentialStops<Stop.CompositeValue<Float, Float>, Float> stops =
-          (ExponentialStops<Stop.CompositeValue<Float, Float>, Float>) layer.getCircleStrokeWidth().getFunction().getStops();
-        Stop<Stop.CompositeValue<Float, Float>, Float> stop = stops.iterator().next();
-        assertEquals(0f, stop.in.zoom, 0.001);
-        assertEquals(0.3f, stop.in.value, 0.001f);
-        assertEquals(0.9f, stop.out, 0.001f);
-      }
-    });
-  }
 
   @Test
   public void testCircleStrokeColorTransition() {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-colorTransitionOptions");
-    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);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setCircleStrokeColorTransition(options);
+      assertEquals(layer.getCircleStrokeColorTransition(), options);
     });
   }
 
@@ -1318,157 +435,42 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    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)");
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleStrokeColorAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-color");
-    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());
-      }
+      // Set and Get
+      layer.setProperties(circleStrokeColor("rgba(0, 0, 0, 1)"));
+      assertEquals((String) layer.getCircleStrokeColor().getValue(), (String) "rgba(0, 0, 0, 1)");
     });
   }
 
   @Test
-  public void testCircleStrokeColorAsIdentitySourceFunction() {
+  public void testCircleStrokeColorAsExpression() {
     validateTestSetup();
     setupLayer();
-    Timber.i("circle-stroke-color");
-    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());
-      }
-    });
-  }
+    Timber.i("circle-stroke-color-expression");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleStrokeColorAsExponentialSourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-color");
-    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());
-      }
+      // Set and Get
+      Expression expression = toColor(Expression.get("undefined"));
+      layer.setProperties(circleStrokeColor(expression));
+      assertEquals(layer.getCircleStrokeColor().getExpression(), expression);
     });
   }
 
-  @Test
-  public void testCircleStrokeColorAsCategoricalSourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-color");
-    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());
-      }
-    });
-
-  }
 
   @Test
   public void testCircleStrokeColorAsIntConstant() {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-color");
-    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);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      layer.setProperties(circleStrokeColor(Color.RED));
+      assertEquals(layer.getCircleStrokeColorAsInt(), Color.RED);
     });
   }
 
@@ -1477,199 +479,43 @@ public class CircleLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacityTransitionOptions");
-    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);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleStrokeOpacityAsConstant() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-opacity");
-    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);
-      }
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setCircleStrokeOpacityTransition(options);
+      assertEquals(layer.getCircleStrokeOpacityTransition(), options);
     });
   }
 
   @Test
-  public void testCircleStrokeOpacityAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-opacity");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          circleStrokeOpacity(
-            zoom(
-              exponential(
-                stop(2, circleStrokeOpacity(0.3f))
-              ).withBase(0.5f)
-            )
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getCircleStrokeOpacity());
-        assertNotNull(layer.getCircleStrokeOpacity().getFunction());
-        assertEquals(CameraFunction.class, layer.getCircleStrokeOpacity().getFunction().getClass());
-        assertEquals(ExponentialStops.class, layer.getCircleStrokeOpacity().getFunction().getStops().getClass());
-        assertEquals(0.5f, ((ExponentialStops) layer.getCircleStrokeOpacity().getFunction().getStops()).getBase(), 0.001);
-        assertEquals(1, ((ExponentialStops) layer.getCircleStrokeOpacity().getFunction().getStops()).size());
-      }
-    });
-  }
-
-  @Test
-  public void testCircleStrokeOpacityAsIdentitySourceFunction() {
+  public void testCircleStrokeOpacityAsConstant() {
     validateTestSetup();
     setupLayer();
     Timber.i("circle-stroke-opacity");
-    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());
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleStrokeOpacityAsExponentialSourceFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-opacity");
-    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());
-      }
+      // Set and Get
+      layer.setProperties(circleStrokeOpacity(0.3f));
+      assertEquals((Float) layer.getCircleStrokeOpacity().getValue(), (Float) 0.3f);
     });
   }
 
   @Test
-  public void testCircleStrokeOpacityAsCategoricalSourceFunction() {
+  public void testCircleStrokeOpacityAsExpression() {
     validateTestSetup();
     setupLayer();
-    Timber.i("circle-stroke-opacity");
-    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());
-      }
-    });
-
-  }
+    Timber.i("circle-stroke-opacity-expression");
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testCircleStrokeOpacityAsCompositeFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("circle-stroke-opacity");
-    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);
-      }
+      // Set and Get
+      Expression expression = number(Expression.get("undefined"));
+      layer.setProperties(circleStrokeOpacity(expression));
+      assertEquals(layer.getCircleStrokeOpacity().getExpression(), expression);
     });
   }
 
-}
+}
\ No newline at end of file