diff --git a/test/modules/extensions/data-filter.spec.ts b/test/modules/extensions/data-filter.spec.ts
index 824fd7703ff..1491a6eed6a 100644
--- a/test/modules/extensions/data-filter.spec.ts
+++ b/test/modules/extensions/data-filter.spec.ts
@@ -105,8 +105,8 @@ test('DataFilterExtension#categories', t => {
 
         const attributes = layer.getAttributeManager().getAttributes();
         t.deepEqual(
-          attributes.filterCategoryValues.value,
-          [0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
+          attributes.filterCategoryValues.value.slice(0, 4),
+          [0, 0, 1, 1],
           'filterCategoryValues attribute is populated'
         );
         t.notOk(attributes.filterValues, 'filterValues attribute is not populated');
diff --git a/test/modules/index.ts b/test/modules/index.ts
index 3ca152e4949..a7290abda3e 100644
--- a/test/modules/index.ts
+++ b/test/modules/index.ts
@@ -18,17 +18,22 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import './aggregation-layers';
+// Core
+import './imports-spec';
 import './core';
-import './carto';
-import './extensions';
+
+// Layers and extensions
+import './layers';
+import './mesh-layers';
 import './geo-layers';
+import './aggregation-layers';
+import './extensions';
+
+// Integration
+import './carto';
+import './mapbox';
 import './google-maps';
-import './imports-spec';
 import './json';
 import './jupyter-widget';
-import './layers';
-import './mapbox';
-import './mesh-layers';
 import './react';
 import './main/bundle';
diff --git a/test/render/golden-images/contour-lnglat.png b/test/render/golden-images/contour-lnglat.png
index 7dedd8dea44..b8207f5b53c 100644
Binary files a/test/render/golden-images/contour-lnglat.png and b/test/render/golden-images/contour-lnglat.png differ