diff --git a/doc/source/custom_grids.rst b/doc/source/custom_grids.rst
index f9003fbc..0707787e 100644
--- a/doc/source/custom_grids.rst
+++ b/doc/source/custom_grids.rst
@@ -56,7 +56,7 @@ Example Grid Configuration File: :download:`grid_example.yaml <../../swbundle/gr
 
 Grid configuration files follow the format used by the Satpy and Pyresample
 Python libraries in their
-:doc:`areas.yaml files <pyresample:geometry_utils>` and are in the
+:doc:`areas.yaml files <pyresample:howtos/geometry_utils>` and are in the
 `YAML text format <https://en.wikipedia.org/wiki/YAML>`_.
 Comments can be added by prefixing lines with a ``#`` character. There is an
 example file provided in the |project| bundle at:
diff --git a/etc/colormaps/abi_l2_modified_cloud_top.cmap b/etc/colormaps/abi_l2_modified_cloud_top.cmap
index 4a34fdd5..6a201032 100644
--- a/etc/colormaps/abi_l2_modified_cloud_top.cmap
+++ b/etc/colormaps/abi_l2_modified_cloud_top.cmap
@@ -1,30 +1,30 @@
 0.0,127,0,127
-16.9983,127,0,127
-17.00085,150,75,20
-33.99915,150,75,20
-34.0017,255,171,127
-51.0,255,171,127
-51.00255,255,127,0
-67.9983,255,127,0
-68.00085,255,255,50
-84.99915,255,255,50
-85.0017,220,220,40
-102.0,220,220,40
-102.00255,58,135,0
-118.9983,58,135,0
-119.00085,75,175,0
-135.99915,75,175,0
-136.0017,100,200,130
-153.0,100,200,130
-153.00255,112,219,147
-169.9983,112,219,147
-170.00084999999999,120,120,240
-186.99915000000001,120,120,240
-187.0017,150,150,245
-204.0,150,150,245
-204.00255,180,180,250
-220.9983,180,180,250
-221.00085,225,225,255
-237.99915,225,225,255
-238.0017,255,255,255
+17.000001,127,0,127
+17.000002,150,75,20
+34.000001,150,75,20
+34.000002,255,171,127
+51.000001,255,171,127
+51.000002,255,127,0
+68.000001,255,127,0
+68.000002,255,255,50
+85.000001,255,255,50
+85.000002,220,220,40
+102.000001,220,220,40
+102.000002,58,135,0
+119.000001,58,135,0
+119.000002,75,175,0
+136.000001,75,175,0
+136.000002,100,200,130
+153.000001,100,200,130
+153.000002,112,219,147
+170.000001,112,219,147
+170.000002,120,120,240
+187.000001,120,120,240
+187.000002,150,150,245
+204.000001,150,150,245
+204.000002,180,180,250
+221.000001,180,180,250
+221.000002,225,225,255
+238.000001,225,225,255
+238.000002,255,255,255
 255.0,255,255,255
diff --git a/etc/enhancements/abi.yaml b/etc/enhancements/abi.yaml
index d647efbc..5f358098 100644
--- a/etc/enhancements/abi.yaml
+++ b/etc/enhancements/abi.yaml
@@ -32,6 +32,17 @@ enhancements:
         kwargs: {stretch: 'crude', min_stretch: 280., max_stretch: 180.}
 
   # Level 2
+  aerosol_optical_depth:
+    name: AOD
+    operations:
+      - name: colorize
+        method: !!python/name:satpy.enhancements.colorize
+        kwargs:
+          palettes:
+            - filename: colormaps/abi_l2_modified_cloud_top.cmap
+              min_value: 0.0
+              max_value: 1.0
+
   cloud_top_height:
     name: HT
     operations:
@@ -43,6 +54,17 @@ enhancements:
               min_value: -300
               max_value: 20000
 
+  land_surface_temp:
+    name: LST
+    operations:
+      - name: colorize
+        method: !!python/name:satpy.enhancements.colorize
+        kwargs:
+          palettes:
+            - filename: colormaps/abi_l2_modified_cloud_top.cmap
+              min_value: 223.15
+              max_value: 323.15
+
   cloud_top_temperature:
     name: TEMP
     operations:
diff --git a/etc/resampling.yaml b/etc/resampling.yaml
index 10936e56..97827aaa 100644
--- a/etc/resampling.yaml
+++ b/etc/resampling.yaml
@@ -86,6 +86,14 @@ resampling:
     kwargs:
       weight_delta_max: 40.0
       weight_distance_max: 2.0
+  default_viirs_edr:
+    area_type: swath
+    sensor: viirs
+    reader: viirs_edr
+    resampler: ewa
+    kwargs:
+      weight_delta_max: 40.0
+      weight_distance_max: 2.0
   default_nucaps:
     area_type: swath
     reader: nucaps
diff --git a/integration_tests/features/steps/compare_images.py b/integration_tests/features/steps/compare_images.py
index 5f5ef3c8..0d03e0b7 100644
--- a/integration_tests/features/steps/compare_images.py
+++ b/integration_tests/features/steps/compare_images.py
@@ -30,7 +30,15 @@ def step_impl_input_data(context, source):
 
 @given("an empty working directory")
 def step_impl_empty_work_dir(context):
-    context.temp_dir = tempfile.mkdtemp(prefix=os.path.join(context.base_temp_dir, "p2g_tests_"))
+    prefix = os.path.join(context.base_temp_dir, "p2g_tests__")
+    scen_name = context.scenario.name
+    if "@" in scen_name:
+        # "outline" test
+        outline_info = scen_name[scen_name.find("@") + 1 :].strip()
+        outline_info = outline_info.replace(" ", "_").replace(".", "-").lower()
+        prefix += outline_info + "__"
+
+    context.temp_dir = tempfile.mkdtemp(prefix=prefix)
 
 
 @given("input data is copied to the working directory")
diff --git a/polar2grid/readers/abi_l2_nc.py b/polar2grid/readers/abi_l2_nc.py
index fd3bd32b..4baafea3 100644
--- a/polar2grid/readers/abi_l2_nc.py
+++ b/polar2grid/readers/abi_l2_nc.py
@@ -44,6 +44,10 @@
 +---------------------------+-----------------------------------------------------+
 | **Product Name**          | **Description**                                     |
 +===========================+=====================================================+
+| AOD                       | Aerosol Optical Depth                               |
++---------------------------+-----------------------------------------------------+
+| LST                       | Land Surface Temperature                            |
++---------------------------+-----------------------------------------------------+
 | HT                        | Cloud Top Height                                    |
 +---------------------------+-----------------------------------------------------+
 | TEMP                      | Cloud Top Temperature                               |
@@ -61,7 +65,9 @@
 PREFERRED_CHUNK_SIZE: int = 1356
 
 READER_PRODUCTS = [
+    "AOD",
     "HT",
+    "LST",
     "TEMP",
 ]
 COMPOSITE_PRODUCTS = []