diff --git a/.gitignore b/.gitignore
index 3c48d707c..8323a008b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ proto/build
 !/drizzle/**/*.sql
 .eslintcache
 docs/api/html/*
-tests/fixtures/config/*.zip
+test/fixtures/config/*.zip
diff --git a/.prettierignore b/.prettierignore
index ff5f51a28..0d2a6549e 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,7 +1,7 @@
 /dist/
 /drizzle/*/meta/
 /src/generated/
-/tests/fixtures/
+/test/fixtures/
 /docs/
 /coverage/
 /proto/build/
diff --git a/benchmarks/datastore.js b/benchmarks/datastore.js
index 505d7cdfe..234c72bdb 100644
--- a/benchmarks/datastore.js
+++ b/benchmarks/datastore.js
@@ -1,5 +1,5 @@
 import benchmark from 'nanobench'
-import { createDataStore } from '../tests/helpers/datastore.js'
+import { createDataStore } from '../test/helpers/datastore.js'
 
 const datastore = await createDataStore({
   dataTypes: [
diff --git a/package.json b/package.json
index c8998fbb0..486ef7cd6 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "test": "npm-run-all lint test:prettier build:types type test:buildConfigs test:unit test:e2e test:types",
     "test:prettier": "prettier --check .",
     "test:buildConfigs": "node scripts/build-config-fixtures.js",
-    "test:unit": "node --test tests/*.js tests/**/*.js",
+    "test:unit": "node --test",
     "test:e2e": "node --test test-e2e/*.js test-e2e/**/*.js",
     "test:types": "tsc -p test-types/tsconfig.json",
     "build:types": "tsc -p tsconfig.npm.json && cpy 'src/**/*.d.ts' dist",
diff --git a/scripts/build-config-fixtures.js b/scripts/build-config-fixtures.js
index 6142a7747..9a78d8add 100644
--- a/scripts/build-config-fixtures.js
+++ b/scripts/build-config-fixtures.js
@@ -3,10 +3,8 @@ import * as fs from 'node:fs/promises'
 import { createWriteStream } from 'node:fs'
 import { join, relative } from 'node:path'
 
-const CONFIG_FIXTURES_PATH = new URL(
-  '../tests/fixtures/config',
-  import.meta.url
-).pathname
+const CONFIG_FIXTURES_PATH = new URL('../test/fixtures/config', import.meta.url)
+  .pathname
 const dir = await fs.readdir(CONFIG_FIXTURES_PATH, { withFileTypes: true })
 console.log('zipping config fixtures')
 for (const fileOrFolder of dir) {
diff --git a/src/datastore/README.md b/src/datastore/README.md
index 76e8ebfd9..8a2182b75 100644
--- a/src/datastore/README.md
+++ b/src/datastore/README.md
@@ -10,7 +10,7 @@ The `DataStore` class is an API over a CoreManager namespace, responsible for re
 
 The `DataStore` class is used internally by the [`DataType`](../datatype/) class.
 
-An example of `DataStore` usage taken from the [datastore tests](../../tests/datastore.js):
+An example of `DataStore` usage taken from the [datastore tests](../../test/datastore.js):
 
 ```js
 const datastore = new DataStore({
@@ -43,4 +43,4 @@ TODO!
 
 ## Tests
 
-Tests for this module are in [tests/datastore.js](../../tests/datastore.js)
+Tests for this module are in [test/datastore.js](../../test/datastore.js)
diff --git a/src/datatype/README.md b/src/datatype/README.md
index 1eb634582..a8291a909 100644
--- a/src/datatype/README.md
+++ b/src/datatype/README.md
@@ -30,4 +30,4 @@ TODO!
 
 ## Tests
 
-Tests for this module are in [tests/datatype.js](../../tests/datatype.js)
+Tests for this module are in [test/datatype.js](../../test/datatype.js)
diff --git a/test-e2e/config-import.js b/test-e2e/config-import.js
index 55e0420ed..012f27689 100644
--- a/test-e2e/config-import.js
+++ b/test-e2e/config-import.js
@@ -1,7 +1,7 @@
 import test from 'node:test'
 import assert from 'node:assert/strict'
 import { createManager } from './utils.js'
-import { defaultConfigPath } from '../tests/helpers/default-config.js'
+import { defaultConfigPath } from '../test/helpers/default-config.js'
 
 test(' config import - load default config when passed a path to `createProject`', async (t) => {
   const manager = createManager('device0', t)
@@ -78,7 +78,7 @@ test('deletion of data before loading a new config', async (t) => {
 
   // load another config
   await project.importConfig({
-    configPath: './tests/fixtures/config/validConfig.zip',
+    configPath: './test/fixtures/config/validConfig.zip',
   })
 
   // load default config again
diff --git a/test-e2e/manager-basic.js b/test-e2e/manager-basic.js
index cc55bd599..82ace02e5 100644
--- a/test-e2e/manager-basic.js
+++ b/test-e2e/manager-basic.js
@@ -6,7 +6,7 @@ import RAM from 'random-access-memory'
 import { MapeoManager } from '../src/mapeo-manager.js'
 import Fastify from 'fastify'
 import { getExpectedConfig } from './utils.js'
-import { defaultConfigPath } from '../tests/helpers/default-config.js'
+import { defaultConfigPath } from '../test/helpers/default-config.js'
 import { kDataTypes } from '../src/mapeo-project.js'
 import { hashObject } from '../src/utils.js'
 
@@ -133,7 +133,7 @@ test('Consistent loading of config', async (t) => {
 
   const expectedDefault = await getExpectedConfig(defaultConfigPath)
   const expectedMinimal = await getExpectedConfig(
-    'tests/fixtures/config/completeConfig.zip'
+    'test/fixtures/config/completeConfig.zip'
   )
   const projectId = await manager.createProject()
   const project = await manager.getProject(projectId)
@@ -173,7 +173,7 @@ test('Consistent loading of config', async (t) => {
   )
 
   await t.test('loading non-default config when creating project', async () => {
-    const configPath = 'tests/fixtures/config/completeConfig.zip'
+    const configPath = 'test/fixtures/config/completeConfig.zip'
     const projectId = await manager.createProject({ configPath })
 
     const project = await manager.getProject(projectId)
@@ -210,7 +210,7 @@ test('Consistent loading of config', async (t) => {
   await t.test(
     'load different config and check if correctly loaded',
     async () => {
-      const configPath = 'tests/fixtures/config/completeConfig.zip'
+      const configPath = 'test/fixtures/config/completeConfig.zip'
       await project.importConfig({ configPath })
       const projectPresets = await project.preset.getMany()
       assert.deepEqual(
diff --git a/test-e2e/manager-fastify-server.js b/test-e2e/manager-fastify-server.js
index b45193dca..c482fcd8f 100644
--- a/test-e2e/manager-fastify-server.js
+++ b/test-e2e/manager-fastify-server.js
@@ -15,13 +15,13 @@ import { FastifyController } from '../src/fastify-controller.js'
 import { plugin as StaticMapsPlugin } from '../src/fastify-plugins/maps/static-maps.js'
 import { plugin as MapServerPlugin } from '../src/fastify-plugins/maps/index.js'
 import { plugin as OfflineFallbackMapPlugin } from '../src/fastify-plugins/maps/offline-fallback-map.js'
-import { blobMetadata } from '../tests/helpers/blob-store.js'
+import { blobMetadata } from '../test/helpers/blob-store.js'
 
 const BLOB_FIXTURES_DIR = fileURLToPath(
-  new URL('../tests/fixtures/blob-api/', import.meta.url)
+  new URL('../test/fixtures/blob-api/', import.meta.url)
 )
 
-const MAP_FIXTURES_PATH = new URL('../tests/fixtures/maps', import.meta.url)
+const MAP_FIXTURES_PATH = new URL('../test/fixtures/maps', import.meta.url)
   .pathname
 
 const MAPEO_FALLBACK_MAP_PATH = new URL(
diff --git a/test-e2e/sync.js b/test-e2e/sync.js
index e369ee98a..47da3bc58 100644
--- a/test-e2e/sync.js
+++ b/test-e2e/sync.js
@@ -18,7 +18,7 @@ import {
   waitForSync,
 } from './utils.js'
 import { kCoreManager } from '../src/mapeo-project.js'
-import { getKeys } from '../tests/helpers/core-manager.js'
+import { getKeys } from '../test/helpers/core-manager.js'
 import { NAMESPACES, PRESYNC_NAMESPACES } from '../src/constants.js'
 import { FastifyController } from '../src/fastify-controller.js'
 import { generate } from '@mapeo/mock-data'
@@ -26,7 +26,7 @@ import { valueOf } from '../src/utils.js'
 import pTimeout from 'p-timeout'
 import { BLOCKED_ROLE_ID, COORDINATOR_ROLE_ID } from '../src/roles.js'
 import { kSyncState } from '../src/sync/sync-api.js'
-import { blobMetadata } from '../tests/helpers/blob-store.js'
+import { blobMetadata } from '../test/helpers/blob-store.js'
 /** @import { State } from '../src/sync/sync-api.js' */
 
 const SCHEMAS_INITIAL_SYNC = ['preset', 'field']
@@ -138,7 +138,7 @@ test('syncing blobs', async (t) => {
   const [invitorProject, inviteeProject] = projects
 
   const fixturePath = new URL(
-    '../tests/fixtures/images/02-digidem-logo.jpg',
+    '../test/fixtures/images/02-digidem-logo.jpg',
     import.meta.url
   ).pathname
 
@@ -347,7 +347,7 @@ test('auto-stop', async (t) => {
   await clock.tickAsync(9000)
 
   const fixturePath = new URL(
-    '../tests/fixtures/images/02-digidem-logo.jpg',
+    '../test/fixtures/images/02-digidem-logo.jpg',
     import.meta.url
   ).pathname
   const blob = await invitorProject.$blobs.create(
diff --git a/test-e2e/translation-api.js b/test-e2e/translation-api.js
index bb94b925a..c1e67d408 100644
--- a/test-e2e/translation-api.js
+++ b/test-e2e/translation-api.js
@@ -2,7 +2,7 @@ import test from 'node:test'
 import assert from 'node:assert/strict'
 import { isDefined } from '../src/utils.js'
 import { createManagers, ManagerCustodian } from './utils.js'
-import { defaultConfigPath } from '../tests/helpers/default-config.js'
+import { defaultConfigPath } from '../test/helpers/default-config.js'
 import {
   fieldsTranslationMap,
   fieldTranslations,
diff --git a/tests/bitfield-rle.js b/test/bitfield-rle.js
similarity index 100%
rename from tests/bitfield-rle.js
rename to test/bitfield-rle.js
diff --git a/tests/blob-api.js b/test/blob-api.js
similarity index 100%
rename from tests/blob-api.js
rename to test/blob-api.js
diff --git a/tests/blob-store/blob-store.js b/test/blob-store/blob-store.js
similarity index 100%
rename from tests/blob-store/blob-store.js
rename to test/blob-store/blob-store.js
diff --git a/tests/blob-store/combine-states.js b/test/blob-store/combine-states.js
similarity index 100%
rename from tests/blob-store/combine-states.js
rename to test/blob-store/combine-states.js
diff --git a/tests/blob-store/live-download.js b/test/blob-store/live-download.js
similarity index 100%
rename from tests/blob-store/live-download.js
rename to test/blob-store/live-download.js
diff --git a/tests/config-import.js b/test/config-import.js
similarity index 83%
rename from tests/config-import.js
rename to test/config-import.js
index 6eb71bc5d..7b425dc7b 100644
--- a/tests/config-import.js
+++ b/test/config-import.js
@@ -15,7 +15,7 @@ test('config import - loading', async () => {
   )
 
   await assert.rejects(
-    async () => await readConfig('./tests/fixtures/config/notAZip.txt'),
+    async () => await readConfig('./test/fixtures/config/notAZip.txt'),
     /End of Central Directory Record not found/,
     'not a zip file'
   )
@@ -34,81 +34,81 @@ test('config import - loading', async () => {
 
   await assert.rejects(
     async () =>
-      await readConfig('./tests/fixtures/config/configWithoutPresets.zip'),
+      await readConfig('./test/fixtures/config/configWithoutPresets.zip'),
     /Error: Zip file does not contain presets.json/,
     'missing presets.json'
   )
 
   await assert.rejects(
     async () =>
-      await readConfig('./tests/fixtures/config/invalidPresetsJSON.zip'),
+      await readConfig('./test/fixtures/config/invalidPresetsJSON.zip'),
     /Error: Could not parse presets.json/,
     'JSON.parse error of presets.json'
   )
 
   await assert.rejects(
     async () =>
-      await readConfig('./tests/fixtures/config/invalidPresetsFile.zip'),
+      await readConfig('./test/fixtures/config/invalidPresetsFile.zip'),
     /Error: Invalid presets.json file/,
     'presets.json is not an object'
   )
 
   await assert.rejects(
     async () =>
-      await readConfig('./tests/fixtures/config/missingPresetsField.zip'),
+      await readConfig('./test/fixtures/config/missingPresetsField.zip'),
     /Error: Invalid presets.json file/,
     'no presets field in presets.json'
   )
 
   await assert.rejects(
     async () =>
-      await readConfig('./tests/fixtures/config/presetsFieldNotAnObject.zip'),
+      await readConfig('./test/fixtures/config/presetsFieldNotAnObject.zip'),
     /Error: Invalid presets.json file/,
     'presets field in presets.json is not an object'
   )
 
   await assert.rejects(
     async () =>
-      await readConfig('./tests/fixtures/config/missingFieldsField.zip'),
+      await readConfig('./test/fixtures/config/missingFieldsField.zip'),
     /Error: Invalid presets.json file/,
     'no fields field in presets.json'
   )
 
   await assert.rejects(
     async () =>
-      await readConfig('./tests/fixtures/config/fieldsFieldNotAnObject.zip'),
+      await readConfig('./test/fixtures/config/fieldsFieldNotAnObject.zip'),
     /Error: Invalid presets.json file/,
     'fields field in presets.json is not an object'
   )
 
   await assert.rejects(
-    async () => await readConfig('./tests/fixtures/config/missingMetadata.zip'),
+    async () => await readConfig('./test/fixtures/config/missingMetadata.zip'),
     /Zip file does not contain metadata.json/,
     ''
   )
 
   await assert.rejects(
-    async () => await readConfig('./tests/fixtures/config/invalidMetadata.zip'),
+    async () => await readConfig('./test/fixtures/config/invalidMetadata.zip'),
     /Could not parse metadata.json/,
     ''
   )
 
   await assert.rejects(
     async () =>
-      await readConfig('./tests/fixtures/config/invalidMetadataKey.zip'),
+      await readConfig('./test/fixtures/config/invalidMetadataKey.zip'),
     /Error: Invalid structure of metadata file/,
     ''
   )
 
   await assert.rejects(
     async () =>
-      await readConfig('./tests/fixtures/config/invalidMetadataValue.zip'),
+      await readConfig('./test/fixtures/config/invalidMetadataValue.zip'),
     /Error: Invalid structure of metadata file/,
     ''
   )
 
   assert(
-    await readConfig('./tests/fixtures/config/validConfig.zip'),
+    await readConfig('./test/fixtures/config/validConfig.zip'),
     'valid zip'
   )
 })
@@ -116,7 +116,7 @@ test('config import - loading', async () => {
 test('config import - icons', async () => {
   // filename
   let config = await readConfig(
-    './tests/fixtures/config/invalidIconFilename.zip'
+    './test/fixtures/config/invalidIconFilename.zip'
   )
   await arrayFrom(config.icons())
   assert.equal(
@@ -131,7 +131,7 @@ test('config import - icons', async () => {
 
   // pixel density
   config = await readConfig(
-    './tests/fixtures/config/invalidIconPixelDensity.zip'
+    './test/fixtures/config/invalidIconPixelDensity.zip'
   )
 
   await arrayFrom(config.icons())
@@ -147,7 +147,7 @@ test('config import - icons', async () => {
   )
 
   // size
-  config = await readConfig('./tests/fixtures/config/invalidIconSize.zip')
+  config = await readConfig('./test/fixtures/config/invalidIconSize.zip')
 
   await arrayFrom(config.icons())
   assert.equal(
@@ -160,7 +160,7 @@ test('config import - icons', async () => {
     'the error message is about invalid size'
   )
 
-  config = await readConfig('./tests/fixtures/config/validIcons.zip')
+  config = await readConfig('./test/fixtures/config/validIcons.zip')
   const icons = await arrayFrom(config.icons())
   assert.equal(icons.length, 2)
   for (const icon of icons) {
@@ -177,7 +177,7 @@ test('config import - icons', async () => {
 })
 
 test('config import - fields', async () => {
-  let config = await readConfig('./tests/fixtures/config/invalidField.zip')
+  let config = await readConfig('./test/fixtures/config/invalidField.zip')
   arrayFrom(config.fields())
   assert.equal(config.warnings.length, 3, 'we got 3 errors when reading fields')
   assert(
@@ -193,7 +193,7 @@ test('config import - fields', async () => {
     'the third error is because the field is not an object'
   )
 
-  config = await readConfig('./tests/fixtures/config/validField.zip')
+  config = await readConfig('./test/fixtures/config/validField.zip')
   for (const field of config.fields()) {
     assert.equal(field.name, 'nombre-monitor', `field.name is 'nombre-monitor'`)
     assert.equal(
@@ -207,7 +207,7 @@ test('config import - fields', async () => {
 })
 
 test('config import - presets', async () => {
-  let config = await readConfig('./tests/fixtures/config/invalidPreset.zip')
+  let config = await readConfig('./test/fixtures/config/invalidPreset.zip')
   arrayFrom(config.presets())
   assert.equal(
     config.warnings.length,
@@ -223,7 +223,7 @@ test('config import - presets', async () => {
     'the second error is because the preset is null'
   )
 
-  config = await readConfig('./tests/fixtures/config/noIconNameOnPreset.zip')
+  config = await readConfig('./test/fixtures/config/noIconNameOnPreset.zip')
   arrayFrom(config.presets())
   assert.equal(
     config.warnings.length,
@@ -236,7 +236,7 @@ test('config import - presets', async () => {
   )
 
   config = await readConfig(
-    './tests/fixtures/config/invalidIconNameOnPreset.zip'
+    './test/fixtures/config/invalidIconNameOnPreset.zip'
   )
   arrayFrom(config.presets())
   assert(
@@ -244,7 +244,7 @@ test('config import - presets', async () => {
     "there's a warning because the preset references a missing icon"
   )
 
-  config = await readConfig('./tests/fixtures/config/validPreset.zip')
+  config = await readConfig('./test/fixtures/config/validPreset.zip')
   for (const preset of config.presets()) {
     assert.equal(preset.value.schemaName, 'preset', `schemaName is 'preset'`)
     assert(
diff --git a/tests/core-manager.js b/test/core-manager.js
similarity index 100%
rename from tests/core-manager.js
rename to test/core-manager.js
diff --git a/tests/core-ownership.js b/test/core-ownership.js
similarity index 100%
rename from tests/core-ownership.js
rename to test/core-ownership.js
diff --git a/tests/data-type.js b/test/data-type.js
similarity index 100%
rename from tests/data-type.js
rename to test/data-type.js
diff --git a/tests/datastore.js b/test/datastore.js
similarity index 100%
rename from tests/datastore.js
rename to test/datastore.js
diff --git a/tests/discovery/local-discovery.js b/test/discovery/local-discovery.js
similarity index 100%
rename from tests/discovery/local-discovery.js
rename to test/discovery/local-discovery.js
diff --git a/tests/fastify-controller.js b/test/fastify-controller.js
similarity index 100%
rename from tests/fastify-controller.js
rename to test/fastify-controller.js
diff --git a/tests/fastify-plugins/blobs.js b/test/fastify-plugins/blobs.js
similarity index 100%
rename from tests/fastify-plugins/blobs.js
rename to test/fastify-plugins/blobs.js
diff --git a/tests/fastify-plugins/icons.js b/test/fastify-plugins/icons.js
similarity index 100%
rename from tests/fastify-plugins/icons.js
rename to test/fastify-plugins/icons.js
diff --git a/tests/fastify-plugins/maps.js b/test/fastify-plugins/maps.js
similarity index 100%
rename from tests/fastify-plugins/maps.js
rename to test/fastify-plugins/maps.js
diff --git a/tests/fastify-plugins/offline-fallback-map.js b/test/fastify-plugins/offline-fallback-map.js
similarity index 100%
rename from tests/fastify-plugins/offline-fallback-map.js
rename to test/fastify-plugins/offline-fallback-map.js
diff --git a/tests/fastify-plugins/static-maps.js b/test/fastify-plugins/static-maps.js
similarity index 100%
rename from tests/fastify-plugins/static-maps.js
rename to test/fastify-plugins/static-maps.js
diff --git a/tests/fixtures/blob-api/audio.mp3 b/test/fixtures/blob-api/audio.mp3
similarity index 100%
rename from tests/fixtures/blob-api/audio.mp3
rename to test/fixtures/blob-api/audio.mp3
diff --git a/tests/fixtures/blob-api/original.png b/test/fixtures/blob-api/original.png
similarity index 100%
rename from tests/fixtures/blob-api/original.png
rename to test/fixtures/blob-api/original.png
diff --git a/tests/fixtures/blob-api/preview.png b/test/fixtures/blob-api/preview.png
similarity index 100%
rename from tests/fixtures/blob-api/preview.png
rename to test/fixtures/blob-api/preview.png
diff --git a/tests/fixtures/blob-api/thumbnail.png b/test/fixtures/blob-api/thumbnail.png
similarity index 100%
rename from tests/fixtures/blob-api/thumbnail.png
rename to test/fixtures/blob-api/thumbnail.png
diff --git a/tests/fixtures/config/completeConfig/icons/access-point-small@3x.png b/test/fixtures/config/completeConfig/icons/access-point-small@3x.png
similarity index 100%
rename from tests/fixtures/config/completeConfig/icons/access-point-small@3x.png
rename to test/fixtures/config/completeConfig/icons/access-point-small@3x.png
diff --git a/tests/fixtures/config/completeConfig/icons/plant-large@1x.png b/test/fixtures/config/completeConfig/icons/plant-large@1x.png
similarity index 100%
rename from tests/fixtures/config/completeConfig/icons/plant-large@1x.png
rename to test/fixtures/config/completeConfig/icons/plant-large@1x.png
diff --git a/tests/fixtures/config/completeConfig/icons/plant-large@2x.png b/test/fixtures/config/completeConfig/icons/plant-large@2x.png
similarity index 100%
rename from tests/fixtures/config/completeConfig/icons/plant-large@2x.png
rename to test/fixtures/config/completeConfig/icons/plant-large@2x.png
diff --git a/tests/fixtures/config/completeConfig/icons/plant-large@3x.png b/test/fixtures/config/completeConfig/icons/plant-large@3x.png
similarity index 100%
rename from tests/fixtures/config/completeConfig/icons/plant-large@3x.png
rename to test/fixtures/config/completeConfig/icons/plant-large@3x.png
diff --git a/tests/fixtures/config/completeConfig/icons/plant-medium@1x.png b/test/fixtures/config/completeConfig/icons/plant-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/completeConfig/icons/plant-medium@1x.png
rename to test/fixtures/config/completeConfig/icons/plant-medium@1x.png
diff --git a/tests/fixtures/config/completeConfig/icons/plant-medium@2x.png b/test/fixtures/config/completeConfig/icons/plant-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/completeConfig/icons/plant-medium@2x.png
rename to test/fixtures/config/completeConfig/icons/plant-medium@2x.png
diff --git a/tests/fixtures/config/completeConfig/icons/plant-medium@3x.png b/test/fixtures/config/completeConfig/icons/plant-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/completeConfig/icons/plant-medium@3x.png
rename to test/fixtures/config/completeConfig/icons/plant-medium@3x.png
diff --git a/tests/fixtures/config/completeConfig/icons/plant-small@1x.png b/test/fixtures/config/completeConfig/icons/plant-small@1x.png
similarity index 100%
rename from tests/fixtures/config/completeConfig/icons/plant-small@1x.png
rename to test/fixtures/config/completeConfig/icons/plant-small@1x.png
diff --git a/tests/fixtures/config/completeConfig/icons/plant-small@2x.png b/test/fixtures/config/completeConfig/icons/plant-small@2x.png
similarity index 100%
rename from tests/fixtures/config/completeConfig/icons/plant-small@2x.png
rename to test/fixtures/config/completeConfig/icons/plant-small@2x.png
diff --git a/tests/fixtures/config/completeConfig/icons/plant-small@3x.png b/test/fixtures/config/completeConfig/icons/plant-small@3x.png
similarity index 100%
rename from tests/fixtures/config/completeConfig/icons/plant-small@3x.png
rename to test/fixtures/config/completeConfig/icons/plant-small@3x.png
diff --git a/tests/fixtures/config/completeConfig/metadata.json b/test/fixtures/config/completeConfig/metadata.json
similarity index 100%
rename from tests/fixtures/config/completeConfig/metadata.json
rename to test/fixtures/config/completeConfig/metadata.json
diff --git a/tests/fixtures/config/completeConfig/presets.json b/test/fixtures/config/completeConfig/presets.json
similarity index 100%
rename from tests/fixtures/config/completeConfig/presets.json
rename to test/fixtures/config/completeConfig/presets.json
diff --git a/tests/fixtures/config/configWithoutPresets/someJson.json b/test/fixtures/config/configWithoutPresets/someJson.json
similarity index 100%
rename from tests/fixtures/config/configWithoutPresets/someJson.json
rename to test/fixtures/config/configWithoutPresets/someJson.json
diff --git a/tests/fixtures/config/fieldsFieldNotAnObject/presets.json b/test/fixtures/config/fieldsFieldNotAnObject/presets.json
similarity index 100%
rename from tests/fixtures/config/fieldsFieldNotAnObject/presets.json
rename to test/fixtures/config/fieldsFieldNotAnObject/presets.json
diff --git a/tests/fixtures/config/invalidField/metadata.json b/test/fixtures/config/invalidField/metadata.json
similarity index 100%
rename from tests/fixtures/config/invalidField/metadata.json
rename to test/fixtures/config/invalidField/metadata.json
diff --git a/tests/fixtures/config/invalidField/presets.json b/test/fixtures/config/invalidField/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidField/presets.json
rename to test/fixtures/config/invalidField/presets.json
diff --git a/tests/fixtures/config/invalidIconFilename/icons/someOtherIconName_10_medium.png b/test/fixtures/config/invalidIconFilename/icons/someOtherIconName_10_medium.png
similarity index 100%
rename from tests/fixtures/config/invalidIconFilename/icons/someOtherIconName_10_medium.png
rename to test/fixtures/config/invalidIconFilename/icons/someOtherIconName_10_medium.png
diff --git a/tests/fixtures/config/invalidIconFilename/metadata.json b/test/fixtures/config/invalidIconFilename/metadata.json
similarity index 100%
rename from tests/fixtures/config/invalidIconFilename/metadata.json
rename to test/fixtures/config/invalidIconFilename/metadata.json
diff --git a/tests/fixtures/config/invalidIconFilename/presets.json b/test/fixtures/config/invalidIconFilename/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidIconFilename/presets.json
rename to test/fixtures/config/invalidIconFilename/presets.json
diff --git a/tests/fixtures/config/invalidIconNameOnPreset/icons/access-point-small@3x.png b/test/fixtures/config/invalidIconNameOnPreset/icons/access-point-small@3x.png
similarity index 100%
rename from tests/fixtures/config/invalidIconNameOnPreset/icons/access-point-small@3x.png
rename to test/fixtures/config/invalidIconNameOnPreset/icons/access-point-small@3x.png
diff --git a/tests/fixtures/config/invalidIconNameOnPreset/icons/plant-small@3x.png b/test/fixtures/config/invalidIconNameOnPreset/icons/plant-small@3x.png
similarity index 100%
rename from tests/fixtures/config/invalidIconNameOnPreset/icons/plant-small@3x.png
rename to test/fixtures/config/invalidIconNameOnPreset/icons/plant-small@3x.png
diff --git a/tests/fixtures/config/invalidIconNameOnPreset/metadata.json b/test/fixtures/config/invalidIconNameOnPreset/metadata.json
similarity index 100%
rename from tests/fixtures/config/invalidIconNameOnPreset/metadata.json
rename to test/fixtures/config/invalidIconNameOnPreset/metadata.json
diff --git a/tests/fixtures/config/invalidIconNameOnPreset/presets.json b/test/fixtures/config/invalidIconNameOnPreset/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidIconNameOnPreset/presets.json
rename to test/fixtures/config/invalidIconNameOnPreset/presets.json
diff --git a/tests/fixtures/config/invalidIconPixelDensity/icons/waterfall-large@6x.png b/test/fixtures/config/invalidIconPixelDensity/icons/waterfall-large@6x.png
similarity index 100%
rename from tests/fixtures/config/invalidIconPixelDensity/icons/waterfall-large@6x.png
rename to test/fixtures/config/invalidIconPixelDensity/icons/waterfall-large@6x.png
diff --git a/tests/fixtures/config/invalidIconPixelDensity/metadata.json b/test/fixtures/config/invalidIconPixelDensity/metadata.json
similarity index 100%
rename from tests/fixtures/config/invalidIconPixelDensity/metadata.json
rename to test/fixtures/config/invalidIconPixelDensity/metadata.json
diff --git a/tests/fixtures/config/invalidIconPixelDensity/presets.json b/test/fixtures/config/invalidIconPixelDensity/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidIconPixelDensity/presets.json
rename to test/fixtures/config/invalidIconPixelDensity/presets.json
diff --git a/tests/fixtures/config/invalidIconSize/icons/waterfall-gigantic@1x.png b/test/fixtures/config/invalidIconSize/icons/waterfall-gigantic@1x.png
similarity index 100%
rename from tests/fixtures/config/invalidIconSize/icons/waterfall-gigantic@1x.png
rename to test/fixtures/config/invalidIconSize/icons/waterfall-gigantic@1x.png
diff --git a/tests/fixtures/config/invalidIconSize/metadata.json b/test/fixtures/config/invalidIconSize/metadata.json
similarity index 100%
rename from tests/fixtures/config/invalidIconSize/metadata.json
rename to test/fixtures/config/invalidIconSize/metadata.json
diff --git a/tests/fixtures/config/invalidIconSize/presets.json b/test/fixtures/config/invalidIconSize/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidIconSize/presets.json
rename to test/fixtures/config/invalidIconSize/presets.json
diff --git a/tests/fixtures/config/invalidMetadata/metadata.json b/test/fixtures/config/invalidMetadata/metadata.json
similarity index 100%
rename from tests/fixtures/config/invalidMetadata/metadata.json
rename to test/fixtures/config/invalidMetadata/metadata.json
diff --git a/tests/fixtures/config/invalidMetadata/presets.json b/test/fixtures/config/invalidMetadata/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidMetadata/presets.json
rename to test/fixtures/config/invalidMetadata/presets.json
diff --git a/tests/fixtures/config/invalidMetadataKey/metadata.json b/test/fixtures/config/invalidMetadataKey/metadata.json
similarity index 100%
rename from tests/fixtures/config/invalidMetadataKey/metadata.json
rename to test/fixtures/config/invalidMetadataKey/metadata.json
diff --git a/tests/fixtures/config/invalidMetadataKey/presets.json b/test/fixtures/config/invalidMetadataKey/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidMetadataKey/presets.json
rename to test/fixtures/config/invalidMetadataKey/presets.json
diff --git a/tests/fixtures/config/invalidMetadataValue/metadata.json b/test/fixtures/config/invalidMetadataValue/metadata.json
similarity index 100%
rename from tests/fixtures/config/invalidMetadataValue/metadata.json
rename to test/fixtures/config/invalidMetadataValue/metadata.json
diff --git a/tests/fixtures/config/invalidMetadataValue/presets.json b/test/fixtures/config/invalidMetadataValue/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidMetadataValue/presets.json
rename to test/fixtures/config/invalidMetadataValue/presets.json
diff --git a/tests/fixtures/config/invalidPreset/metadata.json b/test/fixtures/config/invalidPreset/metadata.json
similarity index 100%
rename from tests/fixtures/config/invalidPreset/metadata.json
rename to test/fixtures/config/invalidPreset/metadata.json
diff --git a/tests/fixtures/config/invalidPreset/presets.json b/test/fixtures/config/invalidPreset/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidPreset/presets.json
rename to test/fixtures/config/invalidPreset/presets.json
diff --git a/tests/fixtures/config/invalidPresetsFile/presets.json b/test/fixtures/config/invalidPresetsFile/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidPresetsFile/presets.json
rename to test/fixtures/config/invalidPresetsFile/presets.json
diff --git a/tests/fixtures/config/invalidPresetsJSON/presets.json b/test/fixtures/config/invalidPresetsJSON/presets.json
similarity index 100%
rename from tests/fixtures/config/invalidPresetsJSON/presets.json
rename to test/fixtures/config/invalidPresetsJSON/presets.json
diff --git a/tests/fixtures/config/missingFieldsField/presets.json b/test/fixtures/config/missingFieldsField/presets.json
similarity index 100%
rename from tests/fixtures/config/missingFieldsField/presets.json
rename to test/fixtures/config/missingFieldsField/presets.json
diff --git a/tests/fixtures/config/missingMetadata/presets.json b/test/fixtures/config/missingMetadata/presets.json
similarity index 100%
rename from tests/fixtures/config/missingMetadata/presets.json
rename to test/fixtures/config/missingMetadata/presets.json
diff --git a/tests/fixtures/config/missingPresetsField/presets.json b/test/fixtures/config/missingPresetsField/presets.json
similarity index 100%
rename from tests/fixtures/config/missingPresetsField/presets.json
rename to test/fixtures/config/missingPresetsField/presets.json
diff --git a/tests/fixtures/config/noIconNameOnPreset/metadata.json b/test/fixtures/config/noIconNameOnPreset/metadata.json
similarity index 100%
rename from tests/fixtures/config/noIconNameOnPreset/metadata.json
rename to test/fixtures/config/noIconNameOnPreset/metadata.json
diff --git a/tests/fixtures/config/noIconNameOnPreset/presets.json b/test/fixtures/config/noIconNameOnPreset/presets.json
similarity index 100%
rename from tests/fixtures/config/noIconNameOnPreset/presets.json
rename to test/fixtures/config/noIconNameOnPreset/presets.json
diff --git a/tests/fixtures/config/notAZip.txt b/test/fixtures/config/notAZip.txt
similarity index 100%
rename from tests/fixtures/config/notAZip.txt
rename to test/fixtures/config/notAZip.txt
diff --git a/tests/fixtures/config/presetsFieldNotAnObject/presets.json b/test/fixtures/config/presetsFieldNotAnObject/presets.json
similarity index 100%
rename from tests/fixtures/config/presetsFieldNotAnObject/presets.json
rename to test/fixtures/config/presetsFieldNotAnObject/presets.json
diff --git a/tests/fixtures/config/validConfig/VERSION b/test/fixtures/config/validConfig/VERSION
similarity index 100%
rename from tests/fixtures/config/validConfig/VERSION
rename to test/fixtures/config/validConfig/VERSION
diff --git a/tests/fixtures/config/validConfig/icons.json b/test/fixtures/config/validConfig/icons.json
similarity index 100%
rename from tests/fixtures/config/validConfig/icons.json
rename to test/fixtures/config/validConfig/icons.json
diff --git a/tests/fixtures/config/validConfig/icons.png b/test/fixtures/config/validConfig/icons.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons.png
rename to test/fixtures/config/validConfig/icons.png
diff --git a/tests/fixtures/config/validConfig/icons.svg b/test/fixtures/config/validConfig/icons.svg
similarity index 100%
rename from tests/fixtures/config/validConfig/icons.svg
rename to test/fixtures/config/validConfig/icons.svg
diff --git a/tests/fixtures/config/validConfig/icons/access-point-large@1x.png b/test/fixtures/config/validConfig/icons/access-point-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/access-point-large@1x.png
rename to test/fixtures/config/validConfig/icons/access-point-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/access-point-large@2x.png b/test/fixtures/config/validConfig/icons/access-point-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/access-point-large@2x.png
rename to test/fixtures/config/validConfig/icons/access-point-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/access-point-large@3x.png b/test/fixtures/config/validConfig/icons/access-point-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/access-point-large@3x.png
rename to test/fixtures/config/validConfig/icons/access-point-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/access-point-medium@1x.png b/test/fixtures/config/validConfig/icons/access-point-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/access-point-medium@1x.png
rename to test/fixtures/config/validConfig/icons/access-point-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/access-point-medium@2x.png b/test/fixtures/config/validConfig/icons/access-point-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/access-point-medium@2x.png
rename to test/fixtures/config/validConfig/icons/access-point-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/access-point-medium@3x.png b/test/fixtures/config/validConfig/icons/access-point-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/access-point-medium@3x.png
rename to test/fixtures/config/validConfig/icons/access-point-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/access-point-small@1x.png b/test/fixtures/config/validConfig/icons/access-point-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/access-point-small@1x.png
rename to test/fixtures/config/validConfig/icons/access-point-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/access-point-small@2x.png b/test/fixtures/config/validConfig/icons/access-point-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/access-point-small@2x.png
rename to test/fixtures/config/validConfig/icons/access-point-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/access-point-small@3x.png b/test/fixtures/config/validConfig/icons/access-point-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/access-point-small@3x.png
rename to test/fixtures/config/validConfig/icons/access-point-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/agrobusiness-large@1x.png b/test/fixtures/config/validConfig/icons/agrobusiness-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/agrobusiness-large@1x.png
rename to test/fixtures/config/validConfig/icons/agrobusiness-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/agrobusiness-large@2x.png b/test/fixtures/config/validConfig/icons/agrobusiness-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/agrobusiness-large@2x.png
rename to test/fixtures/config/validConfig/icons/agrobusiness-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/agrobusiness-large@3x.png b/test/fixtures/config/validConfig/icons/agrobusiness-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/agrobusiness-large@3x.png
rename to test/fixtures/config/validConfig/icons/agrobusiness-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/agrobusiness-medium@1x.png b/test/fixtures/config/validConfig/icons/agrobusiness-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/agrobusiness-medium@1x.png
rename to test/fixtures/config/validConfig/icons/agrobusiness-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/agrobusiness-medium@2x.png b/test/fixtures/config/validConfig/icons/agrobusiness-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/agrobusiness-medium@2x.png
rename to test/fixtures/config/validConfig/icons/agrobusiness-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/agrobusiness-medium@3x.png b/test/fixtures/config/validConfig/icons/agrobusiness-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/agrobusiness-medium@3x.png
rename to test/fixtures/config/validConfig/icons/agrobusiness-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/agrobusiness-small@1x.png b/test/fixtures/config/validConfig/icons/agrobusiness-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/agrobusiness-small@1x.png
rename to test/fixtures/config/validConfig/icons/agrobusiness-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/agrobusiness-small@2x.png b/test/fixtures/config/validConfig/icons/agrobusiness-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/agrobusiness-small@2x.png
rename to test/fixtures/config/validConfig/icons/agrobusiness-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/agrobusiness-small@3x.png b/test/fixtures/config/validConfig/icons/agrobusiness-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/agrobusiness-small@3x.png
rename to test/fixtures/config/validConfig/icons/agrobusiness-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/airstrip-large@1x.png b/test/fixtures/config/validConfig/icons/airstrip-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/airstrip-large@1x.png
rename to test/fixtures/config/validConfig/icons/airstrip-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/airstrip-large@2x.png b/test/fixtures/config/validConfig/icons/airstrip-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/airstrip-large@2x.png
rename to test/fixtures/config/validConfig/icons/airstrip-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/airstrip-large@3x.png b/test/fixtures/config/validConfig/icons/airstrip-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/airstrip-large@3x.png
rename to test/fixtures/config/validConfig/icons/airstrip-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/airstrip-medium@1x.png b/test/fixtures/config/validConfig/icons/airstrip-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/airstrip-medium@1x.png
rename to test/fixtures/config/validConfig/icons/airstrip-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/airstrip-medium@2x.png b/test/fixtures/config/validConfig/icons/airstrip-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/airstrip-medium@2x.png
rename to test/fixtures/config/validConfig/icons/airstrip-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/airstrip-medium@3x.png b/test/fixtures/config/validConfig/icons/airstrip-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/airstrip-medium@3x.png
rename to test/fixtures/config/validConfig/icons/airstrip-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/airstrip-small@1x.png b/test/fixtures/config/validConfig/icons/airstrip-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/airstrip-small@1x.png
rename to test/fixtures/config/validConfig/icons/airstrip-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/airstrip-small@2x.png b/test/fixtures/config/validConfig/icons/airstrip-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/airstrip-small@2x.png
rename to test/fixtures/config/validConfig/icons/airstrip-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/airstrip-small@3x.png b/test/fixtures/config/validConfig/icons/airstrip-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/airstrip-small@3x.png
rename to test/fixtures/config/validConfig/icons/airstrip-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/ancestral-site-large@1x.png b/test/fixtures/config/validConfig/icons/ancestral-site-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/ancestral-site-large@1x.png
rename to test/fixtures/config/validConfig/icons/ancestral-site-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/ancestral-site-large@2x.png b/test/fixtures/config/validConfig/icons/ancestral-site-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/ancestral-site-large@2x.png
rename to test/fixtures/config/validConfig/icons/ancestral-site-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/ancestral-site-large@3x.png b/test/fixtures/config/validConfig/icons/ancestral-site-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/ancestral-site-large@3x.png
rename to test/fixtures/config/validConfig/icons/ancestral-site-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/ancestral-site-medium@1x.png b/test/fixtures/config/validConfig/icons/ancestral-site-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/ancestral-site-medium@1x.png
rename to test/fixtures/config/validConfig/icons/ancestral-site-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/ancestral-site-medium@2x.png b/test/fixtures/config/validConfig/icons/ancestral-site-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/ancestral-site-medium@2x.png
rename to test/fixtures/config/validConfig/icons/ancestral-site-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/ancestral-site-medium@3x.png b/test/fixtures/config/validConfig/icons/ancestral-site-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/ancestral-site-medium@3x.png
rename to test/fixtures/config/validConfig/icons/ancestral-site-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/ancestral-site-small@1x.png b/test/fixtures/config/validConfig/icons/ancestral-site-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/ancestral-site-small@1x.png
rename to test/fixtures/config/validConfig/icons/ancestral-site-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/ancestral-site-small@2x.png b/test/fixtures/config/validConfig/icons/ancestral-site-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/ancestral-site-small@2x.png
rename to test/fixtures/config/validConfig/icons/ancestral-site-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/ancestral-site-small@3x.png b/test/fixtures/config/validConfig/icons/ancestral-site-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/ancestral-site-small@3x.png
rename to test/fixtures/config/validConfig/icons/ancestral-site-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/animal-large@1x.png b/test/fixtures/config/validConfig/icons/animal-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/animal-large@1x.png
rename to test/fixtures/config/validConfig/icons/animal-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/animal-large@2x.png b/test/fixtures/config/validConfig/icons/animal-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/animal-large@2x.png
rename to test/fixtures/config/validConfig/icons/animal-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/animal-large@3x.png b/test/fixtures/config/validConfig/icons/animal-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/animal-large@3x.png
rename to test/fixtures/config/validConfig/icons/animal-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/animal-medium@1x.png b/test/fixtures/config/validConfig/icons/animal-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/animal-medium@1x.png
rename to test/fixtures/config/validConfig/icons/animal-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/animal-medium@2x.png b/test/fixtures/config/validConfig/icons/animal-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/animal-medium@2x.png
rename to test/fixtures/config/validConfig/icons/animal-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/animal-medium@3x.png b/test/fixtures/config/validConfig/icons/animal-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/animal-medium@3x.png
rename to test/fixtures/config/validConfig/icons/animal-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/animal-small@1x.png b/test/fixtures/config/validConfig/icons/animal-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/animal-small@1x.png
rename to test/fixtures/config/validConfig/icons/animal-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/animal-small@2x.png b/test/fixtures/config/validConfig/icons/animal-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/animal-small@2x.png
rename to test/fixtures/config/validConfig/icons/animal-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/animal-small@3x.png b/test/fixtures/config/validConfig/icons/animal-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/animal-small@3x.png
rename to test/fixtures/config/validConfig/icons/animal-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/archaeological-site-large@1x.png b/test/fixtures/config/validConfig/icons/archaeological-site-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/archaeological-site-large@1x.png
rename to test/fixtures/config/validConfig/icons/archaeological-site-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/archaeological-site-large@2x.png b/test/fixtures/config/validConfig/icons/archaeological-site-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/archaeological-site-large@2x.png
rename to test/fixtures/config/validConfig/icons/archaeological-site-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/archaeological-site-large@3x.png b/test/fixtures/config/validConfig/icons/archaeological-site-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/archaeological-site-large@3x.png
rename to test/fixtures/config/validConfig/icons/archaeological-site-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/archaeological-site-medium@1x.png b/test/fixtures/config/validConfig/icons/archaeological-site-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/archaeological-site-medium@1x.png
rename to test/fixtures/config/validConfig/icons/archaeological-site-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/archaeological-site-medium@2x.png b/test/fixtures/config/validConfig/icons/archaeological-site-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/archaeological-site-medium@2x.png
rename to test/fixtures/config/validConfig/icons/archaeological-site-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/archaeological-site-medium@3x.png b/test/fixtures/config/validConfig/icons/archaeological-site-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/archaeological-site-medium@3x.png
rename to test/fixtures/config/validConfig/icons/archaeological-site-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/archaeological-site-small@1x.png b/test/fixtures/config/validConfig/icons/archaeological-site-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/archaeological-site-small@1x.png
rename to test/fixtures/config/validConfig/icons/archaeological-site-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/archaeological-site-small@2x.png b/test/fixtures/config/validConfig/icons/archaeological-site-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/archaeological-site-small@2x.png
rename to test/fixtures/config/validConfig/icons/archaeological-site-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/archaeological-site-small@3x.png b/test/fixtures/config/validConfig/icons/archaeological-site-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/archaeological-site-small@3x.png
rename to test/fixtures/config/validConfig/icons/archaeological-site-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/boundary-large@1x.png b/test/fixtures/config/validConfig/icons/boundary-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/boundary-large@1x.png
rename to test/fixtures/config/validConfig/icons/boundary-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/boundary-large@2x.png b/test/fixtures/config/validConfig/icons/boundary-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/boundary-large@2x.png
rename to test/fixtures/config/validConfig/icons/boundary-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/boundary-large@3x.png b/test/fixtures/config/validConfig/icons/boundary-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/boundary-large@3x.png
rename to test/fixtures/config/validConfig/icons/boundary-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/boundary-medium@1x.png b/test/fixtures/config/validConfig/icons/boundary-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/boundary-medium@1x.png
rename to test/fixtures/config/validConfig/icons/boundary-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/boundary-medium@2x.png b/test/fixtures/config/validConfig/icons/boundary-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/boundary-medium@2x.png
rename to test/fixtures/config/validConfig/icons/boundary-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/boundary-medium@3x.png b/test/fixtures/config/validConfig/icons/boundary-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/boundary-medium@3x.png
rename to test/fixtures/config/validConfig/icons/boundary-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/boundary-small@1x.png b/test/fixtures/config/validConfig/icons/boundary-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/boundary-small@1x.png
rename to test/fixtures/config/validConfig/icons/boundary-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/boundary-small@2x.png b/test/fixtures/config/validConfig/icons/boundary-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/boundary-small@2x.png
rename to test/fixtures/config/validConfig/icons/boundary-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/boundary-small@3x.png b/test/fixtures/config/validConfig/icons/boundary-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/boundary-small@3x.png
rename to test/fixtures/config/validConfig/icons/boundary-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/burial-site-large@1x.png b/test/fixtures/config/validConfig/icons/burial-site-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/burial-site-large@1x.png
rename to test/fixtures/config/validConfig/icons/burial-site-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/burial-site-large@2x.png b/test/fixtures/config/validConfig/icons/burial-site-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/burial-site-large@2x.png
rename to test/fixtures/config/validConfig/icons/burial-site-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/burial-site-large@3x.png b/test/fixtures/config/validConfig/icons/burial-site-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/burial-site-large@3x.png
rename to test/fixtures/config/validConfig/icons/burial-site-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/burial-site-medium@1x.png b/test/fixtures/config/validConfig/icons/burial-site-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/burial-site-medium@1x.png
rename to test/fixtures/config/validConfig/icons/burial-site-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/burial-site-medium@2x.png b/test/fixtures/config/validConfig/icons/burial-site-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/burial-site-medium@2x.png
rename to test/fixtures/config/validConfig/icons/burial-site-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/burial-site-medium@3x.png b/test/fixtures/config/validConfig/icons/burial-site-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/burial-site-medium@3x.png
rename to test/fixtures/config/validConfig/icons/burial-site-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/burial-site-small@1x.png b/test/fixtures/config/validConfig/icons/burial-site-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/burial-site-small@1x.png
rename to test/fixtures/config/validConfig/icons/burial-site-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/burial-site-small@2x.png b/test/fixtures/config/validConfig/icons/burial-site-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/burial-site-small@2x.png
rename to test/fixtures/config/validConfig/icons/burial-site-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/burial-site-small@3x.png b/test/fixtures/config/validConfig/icons/burial-site-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/burial-site-small@3x.png
rename to test/fixtures/config/validConfig/icons/burial-site-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/camp-large@1x.png b/test/fixtures/config/validConfig/icons/camp-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/camp-large@1x.png
rename to test/fixtures/config/validConfig/icons/camp-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/camp-large@2x.png b/test/fixtures/config/validConfig/icons/camp-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/camp-large@2x.png
rename to test/fixtures/config/validConfig/icons/camp-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/camp-large@3x.png b/test/fixtures/config/validConfig/icons/camp-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/camp-large@3x.png
rename to test/fixtures/config/validConfig/icons/camp-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/camp-medium@1x.png b/test/fixtures/config/validConfig/icons/camp-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/camp-medium@1x.png
rename to test/fixtures/config/validConfig/icons/camp-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/camp-medium@2x.png b/test/fixtures/config/validConfig/icons/camp-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/camp-medium@2x.png
rename to test/fixtures/config/validConfig/icons/camp-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/camp-medium@3x.png b/test/fixtures/config/validConfig/icons/camp-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/camp-medium@3x.png
rename to test/fixtures/config/validConfig/icons/camp-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/camp-small@1x.png b/test/fixtures/config/validConfig/icons/camp-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/camp-small@1x.png
rename to test/fixtures/config/validConfig/icons/camp-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/camp-small@2x.png b/test/fixtures/config/validConfig/icons/camp-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/camp-small@2x.png
rename to test/fixtures/config/validConfig/icons/camp-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/camp-small@3x.png b/test/fixtures/config/validConfig/icons/camp-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/camp-small@3x.png
rename to test/fixtures/config/validConfig/icons/camp-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/cave-large@1x.png b/test/fixtures/config/validConfig/icons/cave-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/cave-large@1x.png
rename to test/fixtures/config/validConfig/icons/cave-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/cave-large@2x.png b/test/fixtures/config/validConfig/icons/cave-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/cave-large@2x.png
rename to test/fixtures/config/validConfig/icons/cave-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/cave-large@3x.png b/test/fixtures/config/validConfig/icons/cave-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/cave-large@3x.png
rename to test/fixtures/config/validConfig/icons/cave-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/cave-medium@1x.png b/test/fixtures/config/validConfig/icons/cave-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/cave-medium@1x.png
rename to test/fixtures/config/validConfig/icons/cave-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/cave-medium@2x.png b/test/fixtures/config/validConfig/icons/cave-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/cave-medium@2x.png
rename to test/fixtures/config/validConfig/icons/cave-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/cave-medium@3x.png b/test/fixtures/config/validConfig/icons/cave-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/cave-medium@3x.png
rename to test/fixtures/config/validConfig/icons/cave-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/cave-small@1x.png b/test/fixtures/config/validConfig/icons/cave-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/cave-small@1x.png
rename to test/fixtures/config/validConfig/icons/cave-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/cave-small@2x.png b/test/fixtures/config/validConfig/icons/cave-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/cave-small@2x.png
rename to test/fixtures/config/validConfig/icons/cave-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/cave-small@3x.png b/test/fixtures/config/validConfig/icons/cave-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/cave-small@3x.png
rename to test/fixtures/config/validConfig/icons/cave-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/coca-large@1x.png b/test/fixtures/config/validConfig/icons/coca-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/coca-large@1x.png
rename to test/fixtures/config/validConfig/icons/coca-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/coca-large@2x.png b/test/fixtures/config/validConfig/icons/coca-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/coca-large@2x.png
rename to test/fixtures/config/validConfig/icons/coca-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/coca-large@3x.png b/test/fixtures/config/validConfig/icons/coca-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/coca-large@3x.png
rename to test/fixtures/config/validConfig/icons/coca-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/coca-medium@1x.png b/test/fixtures/config/validConfig/icons/coca-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/coca-medium@1x.png
rename to test/fixtures/config/validConfig/icons/coca-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/coca-medium@2x.png b/test/fixtures/config/validConfig/icons/coca-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/coca-medium@2x.png
rename to test/fixtures/config/validConfig/icons/coca-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/coca-medium@3x.png b/test/fixtures/config/validConfig/icons/coca-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/coca-medium@3x.png
rename to test/fixtures/config/validConfig/icons/coca-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/coca-small@1x.png b/test/fixtures/config/validConfig/icons/coca-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/coca-small@1x.png
rename to test/fixtures/config/validConfig/icons/coca-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/coca-small@2x.png b/test/fixtures/config/validConfig/icons/coca-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/coca-small@2x.png
rename to test/fixtures/config/validConfig/icons/coca-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/coca-small@3x.png b/test/fixtures/config/validConfig/icons/coca-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/coca-small@3x.png
rename to test/fixtures/config/validConfig/icons/coca-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/community-large@1x.png b/test/fixtures/config/validConfig/icons/community-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/community-large@1x.png
rename to test/fixtures/config/validConfig/icons/community-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/community-large@2x.png b/test/fixtures/config/validConfig/icons/community-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/community-large@2x.png
rename to test/fixtures/config/validConfig/icons/community-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/community-large@3x.png b/test/fixtures/config/validConfig/icons/community-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/community-large@3x.png
rename to test/fixtures/config/validConfig/icons/community-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/community-medium@1x.png b/test/fixtures/config/validConfig/icons/community-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/community-medium@1x.png
rename to test/fixtures/config/validConfig/icons/community-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/community-medium@2x.png b/test/fixtures/config/validConfig/icons/community-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/community-medium@2x.png
rename to test/fixtures/config/validConfig/icons/community-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/community-medium@3x.png b/test/fixtures/config/validConfig/icons/community-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/community-medium@3x.png
rename to test/fixtures/config/validConfig/icons/community-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/community-small@1x.png b/test/fixtures/config/validConfig/icons/community-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/community-small@1x.png
rename to test/fixtures/config/validConfig/icons/community-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/community-small@2x.png b/test/fixtures/config/validConfig/icons/community-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/community-small@2x.png
rename to test/fixtures/config/validConfig/icons/community-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/community-small@3x.png b/test/fixtures/config/validConfig/icons/community-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/community-small@3x.png
rename to test/fixtures/config/validConfig/icons/community-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/fishing-large@1x.png b/test/fixtures/config/validConfig/icons/fishing-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/fishing-large@1x.png
rename to test/fixtures/config/validConfig/icons/fishing-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/fishing-large@2x.png b/test/fixtures/config/validConfig/icons/fishing-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/fishing-large@2x.png
rename to test/fixtures/config/validConfig/icons/fishing-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/fishing-large@3x.png b/test/fixtures/config/validConfig/icons/fishing-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/fishing-large@3x.png
rename to test/fixtures/config/validConfig/icons/fishing-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/fishing-medium@1x.png b/test/fixtures/config/validConfig/icons/fishing-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/fishing-medium@1x.png
rename to test/fixtures/config/validConfig/icons/fishing-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/fishing-medium@2x.png b/test/fixtures/config/validConfig/icons/fishing-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/fishing-medium@2x.png
rename to test/fixtures/config/validConfig/icons/fishing-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/fishing-medium@3x.png b/test/fixtures/config/validConfig/icons/fishing-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/fishing-medium@3x.png
rename to test/fixtures/config/validConfig/icons/fishing-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/fishing-small@1x.png b/test/fixtures/config/validConfig/icons/fishing-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/fishing-small@1x.png
rename to test/fixtures/config/validConfig/icons/fishing-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/fishing-small@2x.png b/test/fixtures/config/validConfig/icons/fishing-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/fishing-small@2x.png
rename to test/fixtures/config/validConfig/icons/fishing-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/fishing-small@3x.png b/test/fixtures/config/validConfig/icons/fishing-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/fishing-small@3x.png
rename to test/fixtures/config/validConfig/icons/fishing-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/gathering-large@1x.png b/test/fixtures/config/validConfig/icons/gathering-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/gathering-large@1x.png
rename to test/fixtures/config/validConfig/icons/gathering-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/gathering-large@2x.png b/test/fixtures/config/validConfig/icons/gathering-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/gathering-large@2x.png
rename to test/fixtures/config/validConfig/icons/gathering-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/gathering-large@3x.png b/test/fixtures/config/validConfig/icons/gathering-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/gathering-large@3x.png
rename to test/fixtures/config/validConfig/icons/gathering-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/gathering-medium@1x.png b/test/fixtures/config/validConfig/icons/gathering-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/gathering-medium@1x.png
rename to test/fixtures/config/validConfig/icons/gathering-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/gathering-medium@2x.png b/test/fixtures/config/validConfig/icons/gathering-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/gathering-medium@2x.png
rename to test/fixtures/config/validConfig/icons/gathering-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/gathering-medium@3x.png b/test/fixtures/config/validConfig/icons/gathering-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/gathering-medium@3x.png
rename to test/fixtures/config/validConfig/icons/gathering-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/gathering-small@1x.png b/test/fixtures/config/validConfig/icons/gathering-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/gathering-small@1x.png
rename to test/fixtures/config/validConfig/icons/gathering-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/gathering-small@2x.png b/test/fixtures/config/validConfig/icons/gathering-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/gathering-small@2x.png
rename to test/fixtures/config/validConfig/icons/gathering-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/gathering-small@3x.png b/test/fixtures/config/validConfig/icons/gathering-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/gathering-small@3x.png
rename to test/fixtures/config/validConfig/icons/gathering-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/grupo-armado-large@1x.png b/test/fixtures/config/validConfig/icons/grupo-armado-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/grupo-armado-large@1x.png
rename to test/fixtures/config/validConfig/icons/grupo-armado-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/grupo-armado-large@2x.png b/test/fixtures/config/validConfig/icons/grupo-armado-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/grupo-armado-large@2x.png
rename to test/fixtures/config/validConfig/icons/grupo-armado-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/grupo-armado-large@3x.png b/test/fixtures/config/validConfig/icons/grupo-armado-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/grupo-armado-large@3x.png
rename to test/fixtures/config/validConfig/icons/grupo-armado-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/grupo-armado-medium@1x.png b/test/fixtures/config/validConfig/icons/grupo-armado-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/grupo-armado-medium@1x.png
rename to test/fixtures/config/validConfig/icons/grupo-armado-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/grupo-armado-medium@2x.png b/test/fixtures/config/validConfig/icons/grupo-armado-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/grupo-armado-medium@2x.png
rename to test/fixtures/config/validConfig/icons/grupo-armado-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/grupo-armado-medium@3x.png b/test/fixtures/config/validConfig/icons/grupo-armado-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/grupo-armado-medium@3x.png
rename to test/fixtures/config/validConfig/icons/grupo-armado-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/grupo-armado-small@1x.png b/test/fixtures/config/validConfig/icons/grupo-armado-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/grupo-armado-small@1x.png
rename to test/fixtures/config/validConfig/icons/grupo-armado-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/grupo-armado-small@2x.png b/test/fixtures/config/validConfig/icons/grupo-armado-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/grupo-armado-small@2x.png
rename to test/fixtures/config/validConfig/icons/grupo-armado-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/grupo-armado-small@3x.png b/test/fixtures/config/validConfig/icons/grupo-armado-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/grupo-armado-small@3x.png
rename to test/fixtures/config/validConfig/icons/grupo-armado-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/hills-large@1x.png b/test/fixtures/config/validConfig/icons/hills-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hills-large@1x.png
rename to test/fixtures/config/validConfig/icons/hills-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/hills-large@2x.png b/test/fixtures/config/validConfig/icons/hills-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hills-large@2x.png
rename to test/fixtures/config/validConfig/icons/hills-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/hills-large@3x.png b/test/fixtures/config/validConfig/icons/hills-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hills-large@3x.png
rename to test/fixtures/config/validConfig/icons/hills-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/hills-medium@1x.png b/test/fixtures/config/validConfig/icons/hills-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hills-medium@1x.png
rename to test/fixtures/config/validConfig/icons/hills-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/hills-medium@2x.png b/test/fixtures/config/validConfig/icons/hills-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hills-medium@2x.png
rename to test/fixtures/config/validConfig/icons/hills-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/hills-medium@3x.png b/test/fixtures/config/validConfig/icons/hills-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hills-medium@3x.png
rename to test/fixtures/config/validConfig/icons/hills-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/hills-small@1x.png b/test/fixtures/config/validConfig/icons/hills-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hills-small@1x.png
rename to test/fixtures/config/validConfig/icons/hills-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/hills-small@2x.png b/test/fixtures/config/validConfig/icons/hills-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hills-small@2x.png
rename to test/fixtures/config/validConfig/icons/hills-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/hills-small@3x.png b/test/fixtures/config/validConfig/icons/hills-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hills-small@3x.png
rename to test/fixtures/config/validConfig/icons/hills-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/house-large@1x.png b/test/fixtures/config/validConfig/icons/house-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/house-large@1x.png
rename to test/fixtures/config/validConfig/icons/house-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/house-large@2x.png b/test/fixtures/config/validConfig/icons/house-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/house-large@2x.png
rename to test/fixtures/config/validConfig/icons/house-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/house-large@3x.png b/test/fixtures/config/validConfig/icons/house-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/house-large@3x.png
rename to test/fixtures/config/validConfig/icons/house-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/house-medium@1x.png b/test/fixtures/config/validConfig/icons/house-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/house-medium@1x.png
rename to test/fixtures/config/validConfig/icons/house-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/house-medium@2x.png b/test/fixtures/config/validConfig/icons/house-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/house-medium@2x.png
rename to test/fixtures/config/validConfig/icons/house-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/house-medium@3x.png b/test/fixtures/config/validConfig/icons/house-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/house-medium@3x.png
rename to test/fixtures/config/validConfig/icons/house-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/house-small@1x.png b/test/fixtures/config/validConfig/icons/house-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/house-small@1x.png
rename to test/fixtures/config/validConfig/icons/house-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/house-small@2x.png b/test/fixtures/config/validConfig/icons/house-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/house-small@2x.png
rename to test/fixtures/config/validConfig/icons/house-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/house-small@3x.png b/test/fixtures/config/validConfig/icons/house-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/house-small@3x.png
rename to test/fixtures/config/validConfig/icons/house-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/hunting-large@1x.png b/test/fixtures/config/validConfig/icons/hunting-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hunting-large@1x.png
rename to test/fixtures/config/validConfig/icons/hunting-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/hunting-large@2x.png b/test/fixtures/config/validConfig/icons/hunting-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hunting-large@2x.png
rename to test/fixtures/config/validConfig/icons/hunting-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/hunting-large@3x.png b/test/fixtures/config/validConfig/icons/hunting-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hunting-large@3x.png
rename to test/fixtures/config/validConfig/icons/hunting-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/hunting-medium@1x.png b/test/fixtures/config/validConfig/icons/hunting-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hunting-medium@1x.png
rename to test/fixtures/config/validConfig/icons/hunting-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/hunting-medium@2x.png b/test/fixtures/config/validConfig/icons/hunting-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hunting-medium@2x.png
rename to test/fixtures/config/validConfig/icons/hunting-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/hunting-medium@3x.png b/test/fixtures/config/validConfig/icons/hunting-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hunting-medium@3x.png
rename to test/fixtures/config/validConfig/icons/hunting-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/hunting-small@1x.png b/test/fixtures/config/validConfig/icons/hunting-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hunting-small@1x.png
rename to test/fixtures/config/validConfig/icons/hunting-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/hunting-small@2x.png b/test/fixtures/config/validConfig/icons/hunting-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hunting-small@2x.png
rename to test/fixtures/config/validConfig/icons/hunting-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/hunting-small@3x.png b/test/fixtures/config/validConfig/icons/hunting-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/hunting-small@3x.png
rename to test/fixtures/config/validConfig/icons/hunting-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-camp-large@1x.png b/test/fixtures/config/validConfig/icons/illegal-camp-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-camp-large@1x.png
rename to test/fixtures/config/validConfig/icons/illegal-camp-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-camp-large@2x.png b/test/fixtures/config/validConfig/icons/illegal-camp-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-camp-large@2x.png
rename to test/fixtures/config/validConfig/icons/illegal-camp-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-camp-large@3x.png b/test/fixtures/config/validConfig/icons/illegal-camp-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-camp-large@3x.png
rename to test/fixtures/config/validConfig/icons/illegal-camp-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-camp-medium@1x.png b/test/fixtures/config/validConfig/icons/illegal-camp-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-camp-medium@1x.png
rename to test/fixtures/config/validConfig/icons/illegal-camp-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-camp-medium@2x.png b/test/fixtures/config/validConfig/icons/illegal-camp-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-camp-medium@2x.png
rename to test/fixtures/config/validConfig/icons/illegal-camp-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-camp-medium@3x.png b/test/fixtures/config/validConfig/icons/illegal-camp-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-camp-medium@3x.png
rename to test/fixtures/config/validConfig/icons/illegal-camp-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-camp-small@1x.png b/test/fixtures/config/validConfig/icons/illegal-camp-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-camp-small@1x.png
rename to test/fixtures/config/validConfig/icons/illegal-camp-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-camp-small@2x.png b/test/fixtures/config/validConfig/icons/illegal-camp-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-camp-small@2x.png
rename to test/fixtures/config/validConfig/icons/illegal-camp-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-camp-small@3x.png b/test/fixtures/config/validConfig/icons/illegal-camp-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-camp-small@3x.png
rename to test/fixtures/config/validConfig/icons/illegal-camp-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-fishing-large@1x.png b/test/fixtures/config/validConfig/icons/illegal-fishing-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-fishing-large@1x.png
rename to test/fixtures/config/validConfig/icons/illegal-fishing-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-fishing-large@2x.png b/test/fixtures/config/validConfig/icons/illegal-fishing-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-fishing-large@2x.png
rename to test/fixtures/config/validConfig/icons/illegal-fishing-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-fishing-large@3x.png b/test/fixtures/config/validConfig/icons/illegal-fishing-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-fishing-large@3x.png
rename to test/fixtures/config/validConfig/icons/illegal-fishing-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-fishing-medium@1x.png b/test/fixtures/config/validConfig/icons/illegal-fishing-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-fishing-medium@1x.png
rename to test/fixtures/config/validConfig/icons/illegal-fishing-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-fishing-medium@2x.png b/test/fixtures/config/validConfig/icons/illegal-fishing-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-fishing-medium@2x.png
rename to test/fixtures/config/validConfig/icons/illegal-fishing-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-fishing-medium@3x.png b/test/fixtures/config/validConfig/icons/illegal-fishing-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-fishing-medium@3x.png
rename to test/fixtures/config/validConfig/icons/illegal-fishing-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-fishing-small@1x.png b/test/fixtures/config/validConfig/icons/illegal-fishing-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-fishing-small@1x.png
rename to test/fixtures/config/validConfig/icons/illegal-fishing-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-fishing-small@2x.png b/test/fixtures/config/validConfig/icons/illegal-fishing-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-fishing-small@2x.png
rename to test/fixtures/config/validConfig/icons/illegal-fishing-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-fishing-small@3x.png b/test/fixtures/config/validConfig/icons/illegal-fishing-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-fishing-small@3x.png
rename to test/fixtures/config/validConfig/icons/illegal-fishing-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-settlement-large@1x.png b/test/fixtures/config/validConfig/icons/illegal-settlement-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-settlement-large@1x.png
rename to test/fixtures/config/validConfig/icons/illegal-settlement-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-settlement-large@2x.png b/test/fixtures/config/validConfig/icons/illegal-settlement-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-settlement-large@2x.png
rename to test/fixtures/config/validConfig/icons/illegal-settlement-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-settlement-large@3x.png b/test/fixtures/config/validConfig/icons/illegal-settlement-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-settlement-large@3x.png
rename to test/fixtures/config/validConfig/icons/illegal-settlement-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-settlement-medium@1x.png b/test/fixtures/config/validConfig/icons/illegal-settlement-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-settlement-medium@1x.png
rename to test/fixtures/config/validConfig/icons/illegal-settlement-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-settlement-medium@2x.png b/test/fixtures/config/validConfig/icons/illegal-settlement-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-settlement-medium@2x.png
rename to test/fixtures/config/validConfig/icons/illegal-settlement-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-settlement-medium@3x.png b/test/fixtures/config/validConfig/icons/illegal-settlement-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-settlement-medium@3x.png
rename to test/fixtures/config/validConfig/icons/illegal-settlement-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-settlement-small@1x.png b/test/fixtures/config/validConfig/icons/illegal-settlement-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-settlement-small@1x.png
rename to test/fixtures/config/validConfig/icons/illegal-settlement-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-settlement-small@2x.png b/test/fixtures/config/validConfig/icons/illegal-settlement-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-settlement-small@2x.png
rename to test/fixtures/config/validConfig/icons/illegal-settlement-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/illegal-settlement-small@3x.png b/test/fixtures/config/validConfig/icons/illegal-settlement-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/illegal-settlement-small@3x.png
rename to test/fixtures/config/validConfig/icons/illegal-settlement-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/lake-large@1x.png b/test/fixtures/config/validConfig/icons/lake-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/lake-large@1x.png
rename to test/fixtures/config/validConfig/icons/lake-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/lake-large@2x.png b/test/fixtures/config/validConfig/icons/lake-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/lake-large@2x.png
rename to test/fixtures/config/validConfig/icons/lake-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/lake-large@3x.png b/test/fixtures/config/validConfig/icons/lake-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/lake-large@3x.png
rename to test/fixtures/config/validConfig/icons/lake-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/lake-medium@1x.png b/test/fixtures/config/validConfig/icons/lake-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/lake-medium@1x.png
rename to test/fixtures/config/validConfig/icons/lake-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/lake-medium@2x.png b/test/fixtures/config/validConfig/icons/lake-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/lake-medium@2x.png
rename to test/fixtures/config/validConfig/icons/lake-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/lake-medium@3x.png b/test/fixtures/config/validConfig/icons/lake-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/lake-medium@3x.png
rename to test/fixtures/config/validConfig/icons/lake-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/lake-small@1x.png b/test/fixtures/config/validConfig/icons/lake-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/lake-small@1x.png
rename to test/fixtures/config/validConfig/icons/lake-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/lake-small@2x.png b/test/fixtures/config/validConfig/icons/lake-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/lake-small@2x.png
rename to test/fixtures/config/validConfig/icons/lake-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/lake-small@3x.png b/test/fixtures/config/validConfig/icons/lake-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/lake-small@3x.png
rename to test/fixtures/config/validConfig/icons/lake-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/logging-large@1x.png b/test/fixtures/config/validConfig/icons/logging-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/logging-large@1x.png
rename to test/fixtures/config/validConfig/icons/logging-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/logging-large@2x.png b/test/fixtures/config/validConfig/icons/logging-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/logging-large@2x.png
rename to test/fixtures/config/validConfig/icons/logging-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/logging-large@3x.png b/test/fixtures/config/validConfig/icons/logging-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/logging-large@3x.png
rename to test/fixtures/config/validConfig/icons/logging-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/logging-medium@1x.png b/test/fixtures/config/validConfig/icons/logging-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/logging-medium@1x.png
rename to test/fixtures/config/validConfig/icons/logging-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/logging-medium@2x.png b/test/fixtures/config/validConfig/icons/logging-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/logging-medium@2x.png
rename to test/fixtures/config/validConfig/icons/logging-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/logging-medium@3x.png b/test/fixtures/config/validConfig/icons/logging-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/logging-medium@3x.png
rename to test/fixtures/config/validConfig/icons/logging-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/logging-small@1x.png b/test/fixtures/config/validConfig/icons/logging-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/logging-small@1x.png
rename to test/fixtures/config/validConfig/icons/logging-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/logging-small@2x.png b/test/fixtures/config/validConfig/icons/logging-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/logging-small@2x.png
rename to test/fixtures/config/validConfig/icons/logging-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/logging-small@3x.png b/test/fixtures/config/validConfig/icons/logging-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/logging-small@3x.png
rename to test/fixtures/config/validConfig/icons/logging-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/mejoras-large@1x.png b/test/fixtures/config/validConfig/icons/mejoras-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mejoras-large@1x.png
rename to test/fixtures/config/validConfig/icons/mejoras-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/mejoras-large@2x.png b/test/fixtures/config/validConfig/icons/mejoras-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mejoras-large@2x.png
rename to test/fixtures/config/validConfig/icons/mejoras-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/mejoras-large@3x.png b/test/fixtures/config/validConfig/icons/mejoras-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mejoras-large@3x.png
rename to test/fixtures/config/validConfig/icons/mejoras-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/mejoras-medium@1x.png b/test/fixtures/config/validConfig/icons/mejoras-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mejoras-medium@1x.png
rename to test/fixtures/config/validConfig/icons/mejoras-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/mejoras-medium@2x.png b/test/fixtures/config/validConfig/icons/mejoras-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mejoras-medium@2x.png
rename to test/fixtures/config/validConfig/icons/mejoras-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/mejoras-medium@3x.png b/test/fixtures/config/validConfig/icons/mejoras-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mejoras-medium@3x.png
rename to test/fixtures/config/validConfig/icons/mejoras-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/mejoras-small@1x.png b/test/fixtures/config/validConfig/icons/mejoras-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mejoras-small@1x.png
rename to test/fixtures/config/validConfig/icons/mejoras-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/mejoras-small@2x.png b/test/fixtures/config/validConfig/icons/mejoras-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mejoras-small@2x.png
rename to test/fixtures/config/validConfig/icons/mejoras-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/mejoras-small@3x.png b/test/fixtures/config/validConfig/icons/mejoras-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mejoras-small@3x.png
rename to test/fixtures/config/validConfig/icons/mejoras-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/mining-large@1x.png b/test/fixtures/config/validConfig/icons/mining-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mining-large@1x.png
rename to test/fixtures/config/validConfig/icons/mining-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/mining-large@2x.png b/test/fixtures/config/validConfig/icons/mining-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mining-large@2x.png
rename to test/fixtures/config/validConfig/icons/mining-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/mining-large@3x.png b/test/fixtures/config/validConfig/icons/mining-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mining-large@3x.png
rename to test/fixtures/config/validConfig/icons/mining-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/mining-medium@1x.png b/test/fixtures/config/validConfig/icons/mining-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mining-medium@1x.png
rename to test/fixtures/config/validConfig/icons/mining-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/mining-medium@2x.png b/test/fixtures/config/validConfig/icons/mining-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mining-medium@2x.png
rename to test/fixtures/config/validConfig/icons/mining-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/mining-medium@3x.png b/test/fixtures/config/validConfig/icons/mining-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mining-medium@3x.png
rename to test/fixtures/config/validConfig/icons/mining-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/mining-small@1x.png b/test/fixtures/config/validConfig/icons/mining-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mining-small@1x.png
rename to test/fixtures/config/validConfig/icons/mining-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/mining-small@2x.png b/test/fixtures/config/validConfig/icons/mining-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mining-small@2x.png
rename to test/fixtures/config/validConfig/icons/mining-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/mining-small@3x.png b/test/fixtures/config/validConfig/icons/mining-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/mining-small@3x.png
rename to test/fixtures/config/validConfig/icons/mining-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-impact-large@1x.png b/test/fixtures/config/validConfig/icons/oil-impact-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-impact-large@1x.png
rename to test/fixtures/config/validConfig/icons/oil-impact-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-impact-large@2x.png b/test/fixtures/config/validConfig/icons/oil-impact-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-impact-large@2x.png
rename to test/fixtures/config/validConfig/icons/oil-impact-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-impact-large@3x.png b/test/fixtures/config/validConfig/icons/oil-impact-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-impact-large@3x.png
rename to test/fixtures/config/validConfig/icons/oil-impact-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-impact-medium@1x.png b/test/fixtures/config/validConfig/icons/oil-impact-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-impact-medium@1x.png
rename to test/fixtures/config/validConfig/icons/oil-impact-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-impact-medium@2x.png b/test/fixtures/config/validConfig/icons/oil-impact-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-impact-medium@2x.png
rename to test/fixtures/config/validConfig/icons/oil-impact-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-impact-medium@3x.png b/test/fixtures/config/validConfig/icons/oil-impact-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-impact-medium@3x.png
rename to test/fixtures/config/validConfig/icons/oil-impact-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-impact-small@1x.png b/test/fixtures/config/validConfig/icons/oil-impact-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-impact-small@1x.png
rename to test/fixtures/config/validConfig/icons/oil-impact-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-impact-small@2x.png b/test/fixtures/config/validConfig/icons/oil-impact-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-impact-small@2x.png
rename to test/fixtures/config/validConfig/icons/oil-impact-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-impact-small@3x.png b/test/fixtures/config/validConfig/icons/oil-impact-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-impact-small@3x.png
rename to test/fixtures/config/validConfig/icons/oil-impact-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-installation-large@1x.png b/test/fixtures/config/validConfig/icons/oil-installation-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-installation-large@1x.png
rename to test/fixtures/config/validConfig/icons/oil-installation-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-installation-large@2x.png b/test/fixtures/config/validConfig/icons/oil-installation-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-installation-large@2x.png
rename to test/fixtures/config/validConfig/icons/oil-installation-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-installation-large@3x.png b/test/fixtures/config/validConfig/icons/oil-installation-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-installation-large@3x.png
rename to test/fixtures/config/validConfig/icons/oil-installation-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-installation-medium@1x.png b/test/fixtures/config/validConfig/icons/oil-installation-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-installation-medium@1x.png
rename to test/fixtures/config/validConfig/icons/oil-installation-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-installation-medium@2x.png b/test/fixtures/config/validConfig/icons/oil-installation-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-installation-medium@2x.png
rename to test/fixtures/config/validConfig/icons/oil-installation-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-installation-medium@3x.png b/test/fixtures/config/validConfig/icons/oil-installation-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-installation-medium@3x.png
rename to test/fixtures/config/validConfig/icons/oil-installation-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-installation-small@1x.png b/test/fixtures/config/validConfig/icons/oil-installation-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-installation-small@1x.png
rename to test/fixtures/config/validConfig/icons/oil-installation-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-installation-small@2x.png b/test/fixtures/config/validConfig/icons/oil-installation-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-installation-small@2x.png
rename to test/fixtures/config/validConfig/icons/oil-installation-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/oil-installation-small@3x.png b/test/fixtures/config/validConfig/icons/oil-installation-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/oil-installation-small@3x.png
rename to test/fixtures/config/validConfig/icons/oil-installation-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/old-garden-large@1x.png b/test/fixtures/config/validConfig/icons/old-garden-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/old-garden-large@1x.png
rename to test/fixtures/config/validConfig/icons/old-garden-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/old-garden-large@2x.png b/test/fixtures/config/validConfig/icons/old-garden-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/old-garden-large@2x.png
rename to test/fixtures/config/validConfig/icons/old-garden-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/old-garden-large@3x.png b/test/fixtures/config/validConfig/icons/old-garden-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/old-garden-large@3x.png
rename to test/fixtures/config/validConfig/icons/old-garden-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/old-garden-medium@1x.png b/test/fixtures/config/validConfig/icons/old-garden-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/old-garden-medium@1x.png
rename to test/fixtures/config/validConfig/icons/old-garden-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/old-garden-medium@2x.png b/test/fixtures/config/validConfig/icons/old-garden-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/old-garden-medium@2x.png
rename to test/fixtures/config/validConfig/icons/old-garden-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/old-garden-medium@3x.png b/test/fixtures/config/validConfig/icons/old-garden-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/old-garden-medium@3x.png
rename to test/fixtures/config/validConfig/icons/old-garden-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/old-garden-small@1x.png b/test/fixtures/config/validConfig/icons/old-garden-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/old-garden-small@1x.png
rename to test/fixtures/config/validConfig/icons/old-garden-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/old-garden-small@2x.png b/test/fixtures/config/validConfig/icons/old-garden-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/old-garden-small@2x.png
rename to test/fixtures/config/validConfig/icons/old-garden-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/old-garden-small@3x.png b/test/fixtures/config/validConfig/icons/old-garden-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/old-garden-small@3x.png
rename to test/fixtures/config/validConfig/icons/old-garden-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-2-large@1x.png b/test/fixtures/config/validConfig/icons/other-2-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-2-large@1x.png
rename to test/fixtures/config/validConfig/icons/other-2-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-2-large@2x.png b/test/fixtures/config/validConfig/icons/other-2-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-2-large@2x.png
rename to test/fixtures/config/validConfig/icons/other-2-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-2-large@3x.png b/test/fixtures/config/validConfig/icons/other-2-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-2-large@3x.png
rename to test/fixtures/config/validConfig/icons/other-2-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-2-medium@1x.png b/test/fixtures/config/validConfig/icons/other-2-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-2-medium@1x.png
rename to test/fixtures/config/validConfig/icons/other-2-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-2-medium@2x.png b/test/fixtures/config/validConfig/icons/other-2-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-2-medium@2x.png
rename to test/fixtures/config/validConfig/icons/other-2-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-2-medium@3x.png b/test/fixtures/config/validConfig/icons/other-2-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-2-medium@3x.png
rename to test/fixtures/config/validConfig/icons/other-2-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-2-small@1x.png b/test/fixtures/config/validConfig/icons/other-2-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-2-small@1x.png
rename to test/fixtures/config/validConfig/icons/other-2-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-2-small@2x.png b/test/fixtures/config/validConfig/icons/other-2-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-2-small@2x.png
rename to test/fixtures/config/validConfig/icons/other-2-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-2-small@3x.png b/test/fixtures/config/validConfig/icons/other-2-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-2-small@3x.png
rename to test/fixtures/config/validConfig/icons/other-2-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-impact-large@1x.png b/test/fixtures/config/validConfig/icons/other-impact-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-impact-large@1x.png
rename to test/fixtures/config/validConfig/icons/other-impact-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-impact-large@2x.png b/test/fixtures/config/validConfig/icons/other-impact-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-impact-large@2x.png
rename to test/fixtures/config/validConfig/icons/other-impact-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-impact-large@3x.png b/test/fixtures/config/validConfig/icons/other-impact-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-impact-large@3x.png
rename to test/fixtures/config/validConfig/icons/other-impact-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-impact-medium@1x.png b/test/fixtures/config/validConfig/icons/other-impact-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-impact-medium@1x.png
rename to test/fixtures/config/validConfig/icons/other-impact-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-impact-medium@2x.png b/test/fixtures/config/validConfig/icons/other-impact-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-impact-medium@2x.png
rename to test/fixtures/config/validConfig/icons/other-impact-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-impact-medium@3x.png b/test/fixtures/config/validConfig/icons/other-impact-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-impact-medium@3x.png
rename to test/fixtures/config/validConfig/icons/other-impact-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-impact-small@1x.png b/test/fixtures/config/validConfig/icons/other-impact-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-impact-small@1x.png
rename to test/fixtures/config/validConfig/icons/other-impact-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-impact-small@2x.png b/test/fixtures/config/validConfig/icons/other-impact-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-impact-small@2x.png
rename to test/fixtures/config/validConfig/icons/other-impact-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/other-impact-small@3x.png b/test/fixtures/config/validConfig/icons/other-impact-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/other-impact-small@3x.png
rename to test/fixtures/config/validConfig/icons/other-impact-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/palm-large@1x.png b/test/fixtures/config/validConfig/icons/palm-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/palm-large@1x.png
rename to test/fixtures/config/validConfig/icons/palm-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/palm-large@2x.png b/test/fixtures/config/validConfig/icons/palm-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/palm-large@2x.png
rename to test/fixtures/config/validConfig/icons/palm-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/palm-large@3x.png b/test/fixtures/config/validConfig/icons/palm-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/palm-large@3x.png
rename to test/fixtures/config/validConfig/icons/palm-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/palm-medium@1x.png b/test/fixtures/config/validConfig/icons/palm-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/palm-medium@1x.png
rename to test/fixtures/config/validConfig/icons/palm-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/palm-medium@2x.png b/test/fixtures/config/validConfig/icons/palm-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/palm-medium@2x.png
rename to test/fixtures/config/validConfig/icons/palm-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/palm-medium@3x.png b/test/fixtures/config/validConfig/icons/palm-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/palm-medium@3x.png
rename to test/fixtures/config/validConfig/icons/palm-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/palm-small@1x.png b/test/fixtures/config/validConfig/icons/palm-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/palm-small@1x.png
rename to test/fixtures/config/validConfig/icons/palm-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/palm-small@2x.png b/test/fixtures/config/validConfig/icons/palm-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/palm-small@2x.png
rename to test/fixtures/config/validConfig/icons/palm-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/palm-small@3x.png b/test/fixtures/config/validConfig/icons/palm-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/palm-small@3x.png
rename to test/fixtures/config/validConfig/icons/palm-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/path-large@1x.png b/test/fixtures/config/validConfig/icons/path-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/path-large@1x.png
rename to test/fixtures/config/validConfig/icons/path-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/path-large@2x.png b/test/fixtures/config/validConfig/icons/path-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/path-large@2x.png
rename to test/fixtures/config/validConfig/icons/path-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/path-large@3x.png b/test/fixtures/config/validConfig/icons/path-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/path-large@3x.png
rename to test/fixtures/config/validConfig/icons/path-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/path-medium@1x.png b/test/fixtures/config/validConfig/icons/path-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/path-medium@1x.png
rename to test/fixtures/config/validConfig/icons/path-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/path-medium@2x.png b/test/fixtures/config/validConfig/icons/path-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/path-medium@2x.png
rename to test/fixtures/config/validConfig/icons/path-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/path-medium@3x.png b/test/fixtures/config/validConfig/icons/path-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/path-medium@3x.png
rename to test/fixtures/config/validConfig/icons/path-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/path-small@1x.png b/test/fixtures/config/validConfig/icons/path-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/path-small@1x.png
rename to test/fixtures/config/validConfig/icons/path-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/path-small@2x.png b/test/fixtures/config/validConfig/icons/path-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/path-small@2x.png
rename to test/fixtures/config/validConfig/icons/path-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/path-small@3x.png b/test/fixtures/config/validConfig/icons/path-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/path-small@3x.png
rename to test/fixtures/config/validConfig/icons/path-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/plant-large@1x.png b/test/fixtures/config/validConfig/icons/plant-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/plant-large@1x.png
rename to test/fixtures/config/validConfig/icons/plant-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/plant-large@2x.png b/test/fixtures/config/validConfig/icons/plant-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/plant-large@2x.png
rename to test/fixtures/config/validConfig/icons/plant-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/plant-large@3x.png b/test/fixtures/config/validConfig/icons/plant-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/plant-large@3x.png
rename to test/fixtures/config/validConfig/icons/plant-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/plant-medium@1x.png b/test/fixtures/config/validConfig/icons/plant-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/plant-medium@1x.png
rename to test/fixtures/config/validConfig/icons/plant-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/plant-medium@2x.png b/test/fixtures/config/validConfig/icons/plant-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/plant-medium@2x.png
rename to test/fixtures/config/validConfig/icons/plant-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/plant-medium@3x.png b/test/fixtures/config/validConfig/icons/plant-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/plant-medium@3x.png
rename to test/fixtures/config/validConfig/icons/plant-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/plant-small@1x.png b/test/fixtures/config/validConfig/icons/plant-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/plant-small@1x.png
rename to test/fixtures/config/validConfig/icons/plant-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/plant-small@2x.png b/test/fixtures/config/validConfig/icons/plant-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/plant-small@2x.png
rename to test/fixtures/config/validConfig/icons/plant-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/plant-small@3x.png b/test/fixtures/config/validConfig/icons/plant-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/plant-small@3x.png
rename to test/fixtures/config/validConfig/icons/plant-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/poaching-large@1x.png b/test/fixtures/config/validConfig/icons/poaching-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/poaching-large@1x.png
rename to test/fixtures/config/validConfig/icons/poaching-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/poaching-large@2x.png b/test/fixtures/config/validConfig/icons/poaching-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/poaching-large@2x.png
rename to test/fixtures/config/validConfig/icons/poaching-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/poaching-large@3x.png b/test/fixtures/config/validConfig/icons/poaching-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/poaching-large@3x.png
rename to test/fixtures/config/validConfig/icons/poaching-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/poaching-medium@1x.png b/test/fixtures/config/validConfig/icons/poaching-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/poaching-medium@1x.png
rename to test/fixtures/config/validConfig/icons/poaching-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/poaching-medium@2x.png b/test/fixtures/config/validConfig/icons/poaching-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/poaching-medium@2x.png
rename to test/fixtures/config/validConfig/icons/poaching-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/poaching-medium@3x.png b/test/fixtures/config/validConfig/icons/poaching-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/poaching-medium@3x.png
rename to test/fixtures/config/validConfig/icons/poaching-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/poaching-small@1x.png b/test/fixtures/config/validConfig/icons/poaching-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/poaching-small@1x.png
rename to test/fixtures/config/validConfig/icons/poaching-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/poaching-small@2x.png b/test/fixtures/config/validConfig/icons/poaching-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/poaching-small@2x.png
rename to test/fixtures/config/validConfig/icons/poaching-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/poaching-small@3x.png b/test/fixtures/config/validConfig/icons/poaching-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/poaching-small@3x.png
rename to test/fixtures/config/validConfig/icons/poaching-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/river-large@1x.png b/test/fixtures/config/validConfig/icons/river-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/river-large@1x.png
rename to test/fixtures/config/validConfig/icons/river-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/river-large@2x.png b/test/fixtures/config/validConfig/icons/river-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/river-large@2x.png
rename to test/fixtures/config/validConfig/icons/river-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/river-large@3x.png b/test/fixtures/config/validConfig/icons/river-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/river-large@3x.png
rename to test/fixtures/config/validConfig/icons/river-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/river-medium@1x.png b/test/fixtures/config/validConfig/icons/river-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/river-medium@1x.png
rename to test/fixtures/config/validConfig/icons/river-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/river-medium@2x.png b/test/fixtures/config/validConfig/icons/river-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/river-medium@2x.png
rename to test/fixtures/config/validConfig/icons/river-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/river-medium@3x.png b/test/fixtures/config/validConfig/icons/river-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/river-medium@3x.png
rename to test/fixtures/config/validConfig/icons/river-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/river-small@1x.png b/test/fixtures/config/validConfig/icons/river-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/river-small@1x.png
rename to test/fixtures/config/validConfig/icons/river-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/river-small@2x.png b/test/fixtures/config/validConfig/icons/river-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/river-small@2x.png
rename to test/fixtures/config/validConfig/icons/river-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/river-small@3x.png b/test/fixtures/config/validConfig/icons/river-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/river-small@3x.png
rename to test/fixtures/config/validConfig/icons/river-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/road-large@1x.png b/test/fixtures/config/validConfig/icons/road-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/road-large@1x.png
rename to test/fixtures/config/validConfig/icons/road-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/road-large@2x.png b/test/fixtures/config/validConfig/icons/road-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/road-large@2x.png
rename to test/fixtures/config/validConfig/icons/road-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/road-large@3x.png b/test/fixtures/config/validConfig/icons/road-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/road-large@3x.png
rename to test/fixtures/config/validConfig/icons/road-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/road-medium@1x.png b/test/fixtures/config/validConfig/icons/road-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/road-medium@1x.png
rename to test/fixtures/config/validConfig/icons/road-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/road-medium@2x.png b/test/fixtures/config/validConfig/icons/road-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/road-medium@2x.png
rename to test/fixtures/config/validConfig/icons/road-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/road-medium@3x.png b/test/fixtures/config/validConfig/icons/road-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/road-medium@3x.png
rename to test/fixtures/config/validConfig/icons/road-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/road-small@1x.png b/test/fixtures/config/validConfig/icons/road-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/road-small@1x.png
rename to test/fixtures/config/validConfig/icons/road-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/road-small@2x.png b/test/fixtures/config/validConfig/icons/road-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/road-small@2x.png
rename to test/fixtures/config/validConfig/icons/road-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/road-small@3x.png b/test/fixtures/config/validConfig/icons/road-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/road-small@3x.png
rename to test/fixtures/config/validConfig/icons/road-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/sacred-site-large@1x.png b/test/fixtures/config/validConfig/icons/sacred-site-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/sacred-site-large@1x.png
rename to test/fixtures/config/validConfig/icons/sacred-site-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/sacred-site-large@2x.png b/test/fixtures/config/validConfig/icons/sacred-site-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/sacred-site-large@2x.png
rename to test/fixtures/config/validConfig/icons/sacred-site-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/sacred-site-large@3x.png b/test/fixtures/config/validConfig/icons/sacred-site-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/sacred-site-large@3x.png
rename to test/fixtures/config/validConfig/icons/sacred-site-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/sacred-site-medium@1x.png b/test/fixtures/config/validConfig/icons/sacred-site-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/sacred-site-medium@1x.png
rename to test/fixtures/config/validConfig/icons/sacred-site-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/sacred-site-medium@2x.png b/test/fixtures/config/validConfig/icons/sacred-site-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/sacred-site-medium@2x.png
rename to test/fixtures/config/validConfig/icons/sacred-site-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/sacred-site-medium@3x.png b/test/fixtures/config/validConfig/icons/sacred-site-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/sacred-site-medium@3x.png
rename to test/fixtures/config/validConfig/icons/sacred-site-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/sacred-site-small@1x.png b/test/fixtures/config/validConfig/icons/sacred-site-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/sacred-site-small@1x.png
rename to test/fixtures/config/validConfig/icons/sacred-site-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/sacred-site-small@2x.png b/test/fixtures/config/validConfig/icons/sacred-site-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/sacred-site-small@2x.png
rename to test/fixtures/config/validConfig/icons/sacred-site-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/sacred-site-small@3x.png b/test/fixtures/config/validConfig/icons/sacred-site-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/sacred-site-small@3x.png
rename to test/fixtures/config/validConfig/icons/sacred-site-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/salt-lick-large@1x.png b/test/fixtures/config/validConfig/icons/salt-lick-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/salt-lick-large@1x.png
rename to test/fixtures/config/validConfig/icons/salt-lick-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/salt-lick-large@2x.png b/test/fixtures/config/validConfig/icons/salt-lick-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/salt-lick-large@2x.png
rename to test/fixtures/config/validConfig/icons/salt-lick-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/salt-lick-large@3x.png b/test/fixtures/config/validConfig/icons/salt-lick-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/salt-lick-large@3x.png
rename to test/fixtures/config/validConfig/icons/salt-lick-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/salt-lick-medium@1x.png b/test/fixtures/config/validConfig/icons/salt-lick-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/salt-lick-medium@1x.png
rename to test/fixtures/config/validConfig/icons/salt-lick-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/salt-lick-medium@2x.png b/test/fixtures/config/validConfig/icons/salt-lick-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/salt-lick-medium@2x.png
rename to test/fixtures/config/validConfig/icons/salt-lick-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/salt-lick-medium@3x.png b/test/fixtures/config/validConfig/icons/salt-lick-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/salt-lick-medium@3x.png
rename to test/fixtures/config/validConfig/icons/salt-lick-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/salt-lick-small@1x.png b/test/fixtures/config/validConfig/icons/salt-lick-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/salt-lick-small@1x.png
rename to test/fixtures/config/validConfig/icons/salt-lick-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/salt-lick-small@2x.png b/test/fixtures/config/validConfig/icons/salt-lick-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/salt-lick-small@2x.png
rename to test/fixtures/config/validConfig/icons/salt-lick-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/salt-lick-small@3x.png b/test/fixtures/config/validConfig/icons/salt-lick-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/salt-lick-small@3x.png
rename to test/fixtures/config/validConfig/icons/salt-lick-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/swidden-large@1x.png b/test/fixtures/config/validConfig/icons/swidden-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/swidden-large@1x.png
rename to test/fixtures/config/validConfig/icons/swidden-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/swidden-large@2x.png b/test/fixtures/config/validConfig/icons/swidden-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/swidden-large@2x.png
rename to test/fixtures/config/validConfig/icons/swidden-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/swidden-large@3x.png b/test/fixtures/config/validConfig/icons/swidden-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/swidden-large@3x.png
rename to test/fixtures/config/validConfig/icons/swidden-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/swidden-medium@1x.png b/test/fixtures/config/validConfig/icons/swidden-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/swidden-medium@1x.png
rename to test/fixtures/config/validConfig/icons/swidden-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/swidden-medium@2x.png b/test/fixtures/config/validConfig/icons/swidden-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/swidden-medium@2x.png
rename to test/fixtures/config/validConfig/icons/swidden-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/swidden-medium@3x.png b/test/fixtures/config/validConfig/icons/swidden-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/swidden-medium@3x.png
rename to test/fixtures/config/validConfig/icons/swidden-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/swidden-small@1x.png b/test/fixtures/config/validConfig/icons/swidden-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/swidden-small@1x.png
rename to test/fixtures/config/validConfig/icons/swidden-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/swidden-small@2x.png b/test/fixtures/config/validConfig/icons/swidden-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/swidden-small@2x.png
rename to test/fixtures/config/validConfig/icons/swidden-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/swidden-small@3x.png b/test/fixtures/config/validConfig/icons/swidden-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/swidden-small@3x.png
rename to test/fixtures/config/validConfig/icons/swidden-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/tree-large@1x.png b/test/fixtures/config/validConfig/icons/tree-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/tree-large@1x.png
rename to test/fixtures/config/validConfig/icons/tree-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/tree-large@2x.png b/test/fixtures/config/validConfig/icons/tree-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/tree-large@2x.png
rename to test/fixtures/config/validConfig/icons/tree-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/tree-large@3x.png b/test/fixtures/config/validConfig/icons/tree-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/tree-large@3x.png
rename to test/fixtures/config/validConfig/icons/tree-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/tree-medium@1x.png b/test/fixtures/config/validConfig/icons/tree-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/tree-medium@1x.png
rename to test/fixtures/config/validConfig/icons/tree-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/tree-medium@2x.png b/test/fixtures/config/validConfig/icons/tree-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/tree-medium@2x.png
rename to test/fixtures/config/validConfig/icons/tree-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/tree-medium@3x.png b/test/fixtures/config/validConfig/icons/tree-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/tree-medium@3x.png
rename to test/fixtures/config/validConfig/icons/tree-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/tree-small@1x.png b/test/fixtures/config/validConfig/icons/tree-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/tree-small@1x.png
rename to test/fixtures/config/validConfig/icons/tree-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/tree-small@2x.png b/test/fixtures/config/validConfig/icons/tree-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/tree-small@2x.png
rename to test/fixtures/config/validConfig/icons/tree-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/tree-small@3x.png b/test/fixtures/config/validConfig/icons/tree-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/tree-small@3x.png
rename to test/fixtures/config/validConfig/icons/tree-small@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/waterfall-large@1x.png b/test/fixtures/config/validConfig/icons/waterfall-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/waterfall-large@1x.png
rename to test/fixtures/config/validConfig/icons/waterfall-large@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/waterfall-large@2x.png b/test/fixtures/config/validConfig/icons/waterfall-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/waterfall-large@2x.png
rename to test/fixtures/config/validConfig/icons/waterfall-large@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/waterfall-large@3x.png b/test/fixtures/config/validConfig/icons/waterfall-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/waterfall-large@3x.png
rename to test/fixtures/config/validConfig/icons/waterfall-large@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/waterfall-medium@1x.png b/test/fixtures/config/validConfig/icons/waterfall-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/waterfall-medium@1x.png
rename to test/fixtures/config/validConfig/icons/waterfall-medium@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/waterfall-medium@2x.png b/test/fixtures/config/validConfig/icons/waterfall-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/waterfall-medium@2x.png
rename to test/fixtures/config/validConfig/icons/waterfall-medium@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/waterfall-medium@3x.png b/test/fixtures/config/validConfig/icons/waterfall-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/waterfall-medium@3x.png
rename to test/fixtures/config/validConfig/icons/waterfall-medium@3x.png
diff --git a/tests/fixtures/config/validConfig/icons/waterfall-small@1x.png b/test/fixtures/config/validConfig/icons/waterfall-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/waterfall-small@1x.png
rename to test/fixtures/config/validConfig/icons/waterfall-small@1x.png
diff --git a/tests/fixtures/config/validConfig/icons/waterfall-small@2x.png b/test/fixtures/config/validConfig/icons/waterfall-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/waterfall-small@2x.png
rename to test/fixtures/config/validConfig/icons/waterfall-small@2x.png
diff --git a/tests/fixtures/config/validConfig/icons/waterfall-small@3x.png b/test/fixtures/config/validConfig/icons/waterfall-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validConfig/icons/waterfall-small@3x.png
rename to test/fixtures/config/validConfig/icons/waterfall-small@3x.png
diff --git a/tests/fixtures/config/validConfig/metadata.json b/test/fixtures/config/validConfig/metadata.json
similarity index 100%
rename from tests/fixtures/config/validConfig/metadata.json
rename to test/fixtures/config/validConfig/metadata.json
diff --git a/tests/fixtures/config/validConfig/presets.json b/test/fixtures/config/validConfig/presets.json
similarity index 100%
rename from tests/fixtures/config/validConfig/presets.json
rename to test/fixtures/config/validConfig/presets.json
diff --git a/tests/fixtures/config/validConfig/style.css b/test/fixtures/config/validConfig/style.css
similarity index 100%
rename from tests/fixtures/config/validConfig/style.css
rename to test/fixtures/config/validConfig/style.css
diff --git a/tests/fixtures/config/validConfig/translations.json b/test/fixtures/config/validConfig/translations.json
similarity index 100%
rename from tests/fixtures/config/validConfig/translations.json
rename to test/fixtures/config/validConfig/translations.json
diff --git a/tests/fixtures/config/validField/metadata.json b/test/fixtures/config/validField/metadata.json
similarity index 100%
rename from tests/fixtures/config/validField/metadata.json
rename to test/fixtures/config/validField/metadata.json
diff --git a/tests/fixtures/config/validField/presets.json b/test/fixtures/config/validField/presets.json
similarity index 100%
rename from tests/fixtures/config/validField/presets.json
rename to test/fixtures/config/validField/presets.json
diff --git a/tests/fixtures/config/validIcons/icons/plant-large@1x.png b/test/fixtures/config/validIcons/icons/plant-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/plant-large@1x.png
rename to test/fixtures/config/validIcons/icons/plant-large@1x.png
diff --git a/tests/fixtures/config/validIcons/icons/plant-large@2x.png b/test/fixtures/config/validIcons/icons/plant-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/plant-large@2x.png
rename to test/fixtures/config/validIcons/icons/plant-large@2x.png
diff --git a/tests/fixtures/config/validIcons/icons/plant-large@3x.png b/test/fixtures/config/validIcons/icons/plant-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/plant-large@3x.png
rename to test/fixtures/config/validIcons/icons/plant-large@3x.png
diff --git a/tests/fixtures/config/validIcons/icons/tree-large@1x.png b/test/fixtures/config/validIcons/icons/tree-large@1x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/tree-large@1x.png
rename to test/fixtures/config/validIcons/icons/tree-large@1x.png
diff --git a/tests/fixtures/config/validIcons/icons/tree-large@2x.png b/test/fixtures/config/validIcons/icons/tree-large@2x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/tree-large@2x.png
rename to test/fixtures/config/validIcons/icons/tree-large@2x.png
diff --git a/tests/fixtures/config/validIcons/icons/tree-large@3x.png b/test/fixtures/config/validIcons/icons/tree-large@3x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/tree-large@3x.png
rename to test/fixtures/config/validIcons/icons/tree-large@3x.png
diff --git a/tests/fixtures/config/validIcons/icons/tree-medium@1x.png b/test/fixtures/config/validIcons/icons/tree-medium@1x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/tree-medium@1x.png
rename to test/fixtures/config/validIcons/icons/tree-medium@1x.png
diff --git a/tests/fixtures/config/validIcons/icons/tree-medium@2x.png b/test/fixtures/config/validIcons/icons/tree-medium@2x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/tree-medium@2x.png
rename to test/fixtures/config/validIcons/icons/tree-medium@2x.png
diff --git a/tests/fixtures/config/validIcons/icons/tree-medium@3x.png b/test/fixtures/config/validIcons/icons/tree-medium@3x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/tree-medium@3x.png
rename to test/fixtures/config/validIcons/icons/tree-medium@3x.png
diff --git a/tests/fixtures/config/validIcons/icons/tree-small@1x.png b/test/fixtures/config/validIcons/icons/tree-small@1x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/tree-small@1x.png
rename to test/fixtures/config/validIcons/icons/tree-small@1x.png
diff --git a/tests/fixtures/config/validIcons/icons/tree-small@2x.png b/test/fixtures/config/validIcons/icons/tree-small@2x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/tree-small@2x.png
rename to test/fixtures/config/validIcons/icons/tree-small@2x.png
diff --git a/tests/fixtures/config/validIcons/icons/tree-small@3x.png b/test/fixtures/config/validIcons/icons/tree-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validIcons/icons/tree-small@3x.png
rename to test/fixtures/config/validIcons/icons/tree-small@3x.png
diff --git a/tests/fixtures/config/validIcons/metadata.json b/test/fixtures/config/validIcons/metadata.json
similarity index 100%
rename from tests/fixtures/config/validIcons/metadata.json
rename to test/fixtures/config/validIcons/metadata.json
diff --git a/tests/fixtures/config/validIcons/presets.json b/test/fixtures/config/validIcons/presets.json
similarity index 100%
rename from tests/fixtures/config/validIcons/presets.json
rename to test/fixtures/config/validIcons/presets.json
diff --git a/tests/fixtures/config/validPreset/icons/access-point-small@3x.png b/test/fixtures/config/validPreset/icons/access-point-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validPreset/icons/access-point-small@3x.png
rename to test/fixtures/config/validPreset/icons/access-point-small@3x.png
diff --git a/tests/fixtures/config/validPreset/icons/plant-small@3x.png b/test/fixtures/config/validPreset/icons/plant-small@3x.png
similarity index 100%
rename from tests/fixtures/config/validPreset/icons/plant-small@3x.png
rename to test/fixtures/config/validPreset/icons/plant-small@3x.png
diff --git a/tests/fixtures/config/validPreset/metadata.json b/test/fixtures/config/validPreset/metadata.json
similarity index 100%
rename from tests/fixtures/config/validPreset/metadata.json
rename to test/fixtures/config/validPreset/metadata.json
diff --git a/tests/fixtures/config/validPreset/presets.json b/test/fixtures/config/validPreset/presets.json
similarity index 100%
rename from tests/fixtures/config/validPreset/presets.json
rename to test/fixtures/config/validPreset/presets.json
diff --git a/tests/fixtures/images/01-digidem-logo.png b/test/fixtures/images/01-digidem-logo.png
similarity index 100%
rename from tests/fixtures/images/01-digidem-logo.png
rename to test/fixtures/images/01-digidem-logo.png
diff --git a/tests/fixtures/images/02-digidem-logo.jpg b/test/fixtures/images/02-digidem-logo.jpg
similarity index 100%
rename from tests/fixtures/images/02-digidem-logo.jpg
rename to test/fixtures/images/02-digidem-logo.jpg
diff --git a/tests/fixtures/images/random-data.dat b/test/fixtures/images/random-data.dat
similarity index 100%
rename from tests/fixtures/images/random-data.dat
rename to test/fixtures/images/random-data.dat
diff --git a/tests/fixtures/map-style-definitions/mapbox-outdoors-v12.json b/test/fixtures/map-style-definitions/mapbox-outdoors-v12.json
similarity index 100%
rename from tests/fixtures/map-style-definitions/mapbox-outdoors-v12.json
rename to test/fixtures/map-style-definitions/mapbox-outdoors-v12.json
diff --git a/tests/fixtures/map-style-definitions/protomaps-dark-v2.json b/test/fixtures/map-style-definitions/protomaps-dark-v2.json
similarity index 100%
rename from tests/fixtures/map-style-definitions/protomaps-dark-v2.json
rename to test/fixtures/map-style-definitions/protomaps-dark-v2.json
diff --git a/tests/fixtures/maps/default/index.html b/test/fixtures/maps/default/index.html
similarity index 100%
rename from tests/fixtures/maps/default/index.html
rename to test/fixtures/maps/default/index.html
diff --git a/tests/fixtures/maps/default/sprites/sprite.json b/test/fixtures/maps/default/sprites/sprite.json
similarity index 100%
rename from tests/fixtures/maps/default/sprites/sprite.json
rename to test/fixtures/maps/default/sprites/sprite.json
diff --git a/tests/fixtures/maps/default/sprites/sprite.png b/test/fixtures/maps/default/sprites/sprite.png
similarity index 100%
rename from tests/fixtures/maps/default/sprites/sprite.png
rename to test/fixtures/maps/default/sprites/sprite.png
diff --git a/tests/fixtures/maps/default/sprites/sprite@2x.json b/test/fixtures/maps/default/sprites/sprite@2x.json
similarity index 100%
rename from tests/fixtures/maps/default/sprites/sprite@2x.json
rename to test/fixtures/maps/default/sprites/sprite@2x.json
diff --git a/tests/fixtures/maps/default/sprites/sprite@2x.png b/test/fixtures/maps/default/sprites/sprite@2x.png
similarity index 100%
rename from tests/fixtures/maps/default/sprites/sprite@2x.png
rename to test/fixtures/maps/default/sprites/sprite@2x.png
diff --git a/tests/fixtures/maps/default/style.json b/test/fixtures/maps/default/style.json
similarity index 100%
rename from tests/fixtures/maps/default/style.json
rename to test/fixtures/maps/default/style.json
diff --git a/tests/fixtures/maps/default/tiles/mapbox.satellite.asar b/test/fixtures/maps/default/tiles/mapbox.satellite.asar
similarity index 100%
rename from tests/fixtures/maps/default/tiles/mapbox.satellite.asar
rename to test/fixtures/maps/default/tiles/mapbox.satellite.asar
diff --git a/tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf b/test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf
rename to test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf
diff --git a/tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Bold,Arial Unicode MS Regular/0-255.pbf b/test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Bold,Arial Unicode MS Regular/0-255.pbf
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Bold,Arial Unicode MS Regular/0-255.pbf
rename to test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Bold,Arial Unicode MS Regular/0-255.pbf
diff --git a/tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf b/test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf
rename to test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf
diff --git a/tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Medium Italic,Arial Unicode MS Regular/0-255.pbf b/test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Medium Italic,Arial Unicode MS Regular/0-255.pbf
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Medium Italic,Arial Unicode MS Regular/0-255.pbf
rename to test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Medium Italic,Arial Unicode MS Regular/0-255.pbf
diff --git a/tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf b/test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf
rename to test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf
diff --git a/tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf b/test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf
rename to test/fixtures/maps/streets-sat-style/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf
diff --git a/tests/fixtures/maps/streets-sat-style/index.html b/test/fixtures/maps/streets-sat-style/index.html
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/index.html
rename to test/fixtures/maps/streets-sat-style/index.html
diff --git a/tests/fixtures/maps/streets-sat-style/sprites/sprite.json b/test/fixtures/maps/streets-sat-style/sprites/sprite.json
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/sprites/sprite.json
rename to test/fixtures/maps/streets-sat-style/sprites/sprite.json
diff --git a/tests/fixtures/maps/streets-sat-style/sprites/sprite.png b/test/fixtures/maps/streets-sat-style/sprites/sprite.png
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/sprites/sprite.png
rename to test/fixtures/maps/streets-sat-style/sprites/sprite.png
diff --git a/tests/fixtures/maps/streets-sat-style/sprites/sprite@2x.json b/test/fixtures/maps/streets-sat-style/sprites/sprite@2x.json
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/sprites/sprite@2x.json
rename to test/fixtures/maps/streets-sat-style/sprites/sprite@2x.json
diff --git a/tests/fixtures/maps/streets-sat-style/sprites/sprite@2x.png b/test/fixtures/maps/streets-sat-style/sprites/sprite@2x.png
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/sprites/sprite@2x.png
rename to test/fixtures/maps/streets-sat-style/sprites/sprite@2x.png
diff --git a/tests/fixtures/maps/streets-sat-style/style.json b/test/fixtures/maps/streets-sat-style/style.json
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/style.json
rename to test/fixtures/maps/streets-sat-style/style.json
diff --git a/tests/fixtures/maps/streets-sat-style/tiles/mapbox.mapbox-streets-v7.asar b/test/fixtures/maps/streets-sat-style/tiles/mapbox.mapbox-streets-v7.asar
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/tiles/mapbox.mapbox-streets-v7.asar
rename to test/fixtures/maps/streets-sat-style/tiles/mapbox.mapbox-streets-v7.asar
diff --git a/tests/fixtures/maps/streets-sat-style/tiles/mapbox.satellite.asar b/test/fixtures/maps/streets-sat-style/tiles/mapbox.satellite.asar
similarity index 100%
rename from tests/fixtures/maps/streets-sat-style/tiles/mapbox.satellite.asar
rename to test/fixtures/maps/streets-sat-style/tiles/mapbox.satellite.asar
diff --git a/tests/helpers/blob-store.js b/test/helpers/blob-store.js
similarity index 100%
rename from tests/helpers/blob-store.js
rename to test/helpers/blob-store.js
diff --git a/tests/helpers/core-manager.js b/test/helpers/core-manager.js
similarity index 100%
rename from tests/helpers/core-manager.js
rename to test/helpers/core-manager.js
diff --git a/tests/helpers/default-config.js b/test/helpers/default-config.js
similarity index 100%
rename from tests/helpers/default-config.js
rename to test/helpers/default-config.js
diff --git a/tests/helpers/events.js b/test/helpers/events.js
similarity index 100%
rename from tests/helpers/events.js
rename to test/helpers/events.js
diff --git a/tests/helpers/local-peers.js b/test/helpers/local-peers.js
similarity index 100%
rename from tests/helpers/local-peers.js
rename to test/helpers/local-peers.js
diff --git a/tests/icon-api.js b/test/icon-api.js
similarity index 100%
rename from tests/icon-api.js
rename to test/icon-api.js
diff --git a/tests/invite-api.js b/test/invite-api.js
similarity index 100%
rename from tests/invite-api.js
rename to test/invite-api.js
diff --git a/tests/lib/hashmap.js b/test/lib/hashmap.js
similarity index 100%
rename from tests/lib/hashmap.js
rename to test/lib/hashmap.js
diff --git a/tests/lib/key-by.js b/test/lib/key-by.js
similarity index 100%
rename from tests/lib/key-by.js
rename to test/lib/key-by.js
diff --git a/tests/lib/ponyfills.js b/test/lib/ponyfills.js
similarity index 100%
rename from tests/lib/ponyfills.js
rename to test/lib/ponyfills.js
diff --git a/tests/lib/string.js b/test/lib/string.js
similarity index 100%
rename from tests/lib/string.js
rename to test/lib/string.js
diff --git a/tests/lib/timing-safe-equal.js b/test/lib/timing-safe-equal.js
similarity index 100%
rename from tests/lib/timing-safe-equal.js
rename to test/lib/timing-safe-equal.js
diff --git a/tests/local-peers.js b/test/local-peers.js
similarity index 100%
rename from tests/local-peers.js
rename to test/local-peers.js
diff --git a/tests/remote-bitfield.js b/test/remote-bitfield.js
similarity index 100%
rename from tests/remote-bitfield.js
rename to test/remote-bitfield.js
diff --git a/tests/schema.js b/test/schema.js
similarity index 100%
rename from tests/schema.js
rename to test/schema.js
diff --git a/tests/schema/schema-to-drizzle.js b/test/schema/schema-to-drizzle.js
similarity index 100%
rename from tests/schema/schema-to-drizzle.js
rename to test/schema/schema-to-drizzle.js
diff --git a/tests/sync/core-sync-state.js b/test/sync/core-sync-state.js
similarity index 100%
rename from tests/sync/core-sync-state.js
rename to test/sync/core-sync-state.js
diff --git a/tests/sync/namespace-sync-state.js b/test/sync/namespace-sync-state.js
similarity index 100%
rename from tests/sync/namespace-sync-state.js
rename to test/sync/namespace-sync-state.js
diff --git a/tests/translation-api.js b/test/translation-api.js
similarity index 100%
rename from tests/translation-api.js
rename to test/translation-api.js
diff --git a/tests/utils.js b/test/utils.js
similarity index 100%
rename from tests/utils.js
rename to test/utils.js
diff --git a/tsconfig.json b/tsconfig.json
index e211f19c2..050f4e5b5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,6 +27,6 @@
       "*": ["./types", "./node_modules/@digidem/types/vendor/*/index.d.ts"]
     }
   },
-  "include": ["src/**/*", "types/**/*.d.ts", "tests/**/*", "test-e2e/**/*"],
+  "include": ["src/**/*", "types/**/*.d.ts", "test/**/*", "test-e2e/**/*"],
   "exclude": ["node_modules", "src/generated/*.js"]
 }