diff --git a/.gitignore b/.gitignore
index 699ea82f61..5eb826d30f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ caddy_linux_amd64
 .ebextensions/*
 \.ebextensions/
 
-public/js/lib/*
+public/js/*
 
 *.pem
 *.crt
@@ -33,5 +33,4 @@ public/js/lib/*
 !tests/**
 !package.json
 !jsdoc*.json
-!codi.json
-!nodemon.json
\ No newline at end of file
+!codi.json
\ No newline at end of file
diff --git a/DEVELOPING.md b/DEVELOPING.md
index faee483bf1..d8aecda64c 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -24,7 +24,7 @@ Please check the full list of dependencies as defined in the [package.json](http
 
 The MAPP and MAPP.UI library must be build with [esbuild](https://esbuild.github.io/) prior to launching the host.
 
-    npx esbuild ./lib/mapp.mjs ./lib/ui.mjs --bundle --minify --tree-shaking=false --sourcemap --format=iife --outdir=./public/js/lib
+    npx esbuild ./lib/mapp.mjs ./lib/ui.mjs --bundle --minify --tree-shaking=false --sourcemap --format=iife --outdir=./public/js
 
 The build command is stored in the package.json as `_build` script.
 
@@ -36,7 +36,93 @@ ESBuild must also be used to compile the CSS supporting the MAPP and MAPP.UI ele
 
     npx esbuild --bundle public/css/_ui.css --outfile=public/css/ui.css --loader:.svg=dataurl
 
-### Hot rebuild with VSCode Debugger
+## Hot rebuild with nodemon & VSCode Chrome Debugger
+
+### nodemon
+
+The development environment uses nodemon to watch for changes and automatically rebuild the necessary files. This is configured in `nodemon.json`:
+
+```json
+{
+    "watch": [
+        "lib/**/*",
+        "tests/**/*",
+        "public/css/*",
+        "../xyz_resources/**/*"
+    ],
+    "ext": ".js,.mjs,.json,.css,.svg",
+    "ignore": [
+        "public/js/**/*",
+        "public/css/mapp.css",
+        "public/css/ui.css"
+    ],
+    "env": {
+        "NODE_ENV": "DEVELOPMENT"
+    },
+    "exec": "npx concurrently \"node esbuild.config.mjs\" \"npm run ui_css\" \"npm run mapp_css\"",
+    "events": {
+        "start": "echo \"Watching for changes...\"",
+        "exit": "echo \"Build complete\""
+    }
+}
+```
+
+#### Watched Directories
+
+* `lib/**/*`: All files in the lib directory
+* `tests/**/*`: All test files
+* `public/css/*`: CSS source files
+* `../xyz_resources/**/*`: External resource files.
+
+#### File Types Watched
+
+* JavaScript files (`.js`)
+* ES Modules (`.mjs`)
+* JSON files (`.json`)
+* CSS files (`.css`)
+* SVG files (`.svg`)
+
+#### Ignored Files
+
+* Built JavaScript files (`public/js/**/*`)
+
+* Compiled CSS files:
+  * `public/css/mapp.css`
+  * `public/css/ui.css`
+
+#### Automatic Actions
+
+When changes are detected:
+
+1. Rebuilds JavaScript using esbuild
+2. Recompiles UI CSS
+3. Recompiles MAPP CSS
+4. All tasks run concurrently for faster builds
+
+### Running nodemon
+
+1. Start the watch mode:
+
+```bash
+  npx nodemon
+```
+
+2. Nodemon will:
+   * Set `NODE_ENV` to "DEVELOPMENT"
+   * Watch for file changes
+   * Automatically rebuild affected files
+   * Display "Watching for changes..." when started
+   * Show "Build complete" after each rebuild
+
+3. The application will rebuild automatically when you:
+   * Modify test files
+   * Change source code
+   * Update CSS
+   * Modify resources
+
+This ensures that your test environment always has the latest changes without manual rebuilds.
+
+### VSCode Tasks & Launch
 
 A task can be added to the `.vscode/tasks.json` to execute `nodemon` and `browser-sync` concurrently. This will allow VSCode to rebuild the application on script changes in the editor.
 
@@ -79,13 +165,13 @@ A task can be added to the `.vscode/tasks.json` to execute `nodemon` and `browse
 }
 ```
 
-The `browser-sync` script is defined in the `package.json` as `"npx browser-sync start --proxy localhost:3000 --port 3001 --ui-port 3002 --files public/js/lib/**/* --no-open --no-notify"`
+The `browser-sync` script is defined in the `package.json` as `"npx browser-sync start --proxy localhost:3000 --port 3001 --ui-port 3002 --files public/js/**/* --no-open --no-notify"`
 
 The application running on port 3000 will be proxied to port 3001 for the browser-sync event. The browser window will refresh when the node application rebuilds after changes to the script in a VSCode editor.
 
-#### VSCode / Chrome Debugging 
+#### VSCode / Chrome Debugging
 
-An additional debug configuration in `.vscode/launch.json` is required to debug the mapp lib code in VSCode. 
+An additional debug configuration in `.vscode/launch.json` is required to debug the mapp lib code in VSCode.
 
 ```json
 {
@@ -103,7 +189,7 @@ The Chrome debug config must be launched as an additional session. VSCode run an
 
 Breakpoints set in the mapp lib script will now be respected in the VSCode debug editor window. Breakpoints set in the Chrome dev tools will also break in the VSCode editor.
 
-The browser will automatically reload on changes to files in the `lib`, 'tests' and `public/css' directories. 
+The browser will automatically reload on changes to files in the `lib`, 'tests' and `public/css' directories.
 
 #### Additional settings for VSCode
 
diff --git a/TESTING.md b/TESTING.md
index 7cd6a65165..8dc74a7b1f 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -1,78 +1,256 @@
 # Testing
 
-Testing in xyz is split up into 3 different sections.
+Testing in xyz is split into 3 different sections:
 
 1. cli (console)
 2. module (browser)
 3. integrity
 
-## cli (console)
+## Testing Environment Setup
 
-The cli tests are normal vanilla javascript tests that execute with the nodejs runtime using the [Codi Test framework](https://www.npmjs.com/package/codi-test-framework).
-These tests focus on the xyz (mod) directory to test as many things as possible. These tests mostly focus on code that does not require things that would only be found in the browser.
+### Prerequisites
 
-1. Setup
-    - Ensure that you have installed the node modules `npm install`
-    - Ensure that you have bun.sh installed in your enviroment
-    - To run the tests you can execute `npm run test`
+The minimum requirements are:
 
-2. Output
-    - You will find an output of a summary of all the past/failed tests.
+* Node.js (version 18 and above)
+* [codi](https://github.com/RobAndrewHurst/codi)
+* Node modules installed via `npm install`
 
-## module (browser)
+## Test Structure
 
-The module tests are designed to make use of the browser environment by having full access to the DOM.  
-With these tests will have full access to the mapp library and a mapview for the loaded application. This allows us to not need to mock different module imports. Everything will be part of the build. All these tests also make use of the Codi test framework, and make use of the test runner, that is designed to run specifically in a view.
+Tests are organized in the `/tests` directory with two main subdirectories:
 
-To run these tests you will need to lauch the application with specific test settings. These will be provided only to GEOLYTIX developers.
+* `/tests/mod`: CLI tests for the xyz (mod) directory
+* `/tests/lib`: Module tests for browser environment
 
-Launch the application and navigate to localhost:3000/test?template=test_view and open the console of the window.
-You will see the output of the tests running in the console with any passes/failures.
+```bash
+xyz/
+├── mod/
+│   ├── module1/
+│   │   └── feature1.mjs
+├── lib/
+│   ├── module2/
+│   │   └── feature2.mjs
+├── tests/
+│   ├── mod/
+│   │   ├── module1/
+│   │   │   ├── feature1.test.mjs
+│   │   │   └── index.mjs
+│   └── lib/
+│       └── module2/
+│           ├── feature2.test.mjs
+│           └── index.mjs
 
-## integrity
+```
+
+Each test folder exports an object matching its corresponding directory structure:
+
+```javascript
+// tests/mod/module1/index.mjs
+export default {
+  feature1: () => import('./feature1.test.mjs')
+};
+```
+
+## 1. CLI (Console) Tests
+
+CLI tests are vanilla JavaScript tests that execute in the Node.js runtime using the Codi Test framework. These tests focus on the xyz (mod) directory and code that doesn't require browser-specific features.
+
+### Running CLI Tests
+
+The codi test suit will iterate through the tests directory [ignoring the folders specified in codi.json] and log the results from each test suit.
+
+```bash
+npm run test
+```
+
+Summary statistics for all tests will be logged with the `-- quiet` flag (codi v0.0.47+):
+
+```bash
+npm run test -- --quiet
+```
+
+## 2. Module (Browser) Tests
+
+Module tests are designed for the browser environment with full access to:
 
-The integrity tests are designed to check data integrity on deployed appications.
-To run these test naviate to any deployed instance and ensure that you have `?template=test_view&integrity=true` is included in the params of the URL.
+* DOM
+* Mapp library
+* Mapview for loaded application
+* No mocking required for module imports
 
-This will give you a similar output to the normal test_view.
+### Running Module Tests
 
-## Writing tests
+A [test application view](https://github.com/GEOLYTIX/xyz/blob/main/public/views/_test.html) is provided in the public folder to execute browser tests.
 
-When writing tests you will need to make use of different Codi elements to make up your test.
+Mapp module test require ressources which are not publicly accessible. This is to be addressed in a future release.
 
-Include the describe and it functions. These are used as the building blocks to the tests. The describe block is used to describe the overall function and what the test suite is actually trying to achive. The It block is used to make more granular descriptions of different elements/functions of the code.
+Please ensure to run the `_build` script prior to launching the test environment.
 
-In this example we describe what the main output should be. And then we assert the different elements that are part of the module.
-Part of this code is the `assertTrue` function that is used to check if a value is true.
+The current tests require an active user.
 
-```js
+The test view will be requested as the default view from the XYZ View API when the local node process is opened on `localhost:3000/test`.
+
+The test results will be logged to the browser dev console.
+
+VSCode can be used to debug tests and mapp library modules as outlined in the [developer notes](https://github.com/GEOLYTIX/xyz/blob/main/DEVELOPING.md).
+
+## 3. Integrity Tests
+
+Integrity tests check data integrity of a workspace through the test view document. The test view hosted in the public directory is set as a view templates in the workspace templates. This can be requested from the View API by setting `test_view` as template URL parameter.
+
+The data integrity tests are currently evaluated for public access.
+
+## Writing Tests
+
+### Test Structure
+
+Tests use the describe-it pattern for organization:
+
+```javascript
 import { describe, it, assertTrue } from 'codi';
+
+describe('Feature Description', () => {
+  it('should behave in a specific way', () => {
+    // Test code
+  });
+});
+```
+
+Example with multiple assertions:
+
+```javascript
 describe('All languages should have the same base language entries', () => {
-...
-        Object.keys(mapp.dictionaries).forEach(language => {
-            it(`The ${language} dictionary should have all the base keys`, () => {
-                Object.keys(base_dictionary).forEach(key => {
-                    assertTrue(!!mapp.dictionaries[language][key], `${language} should have ${key}`);
-                });
-            });
-        });
-...
+  Object.keys(mapp.dictionaries).forEach(language => {
+    it(`The ${language} dictionary should have all the base keys`, () => {
+      Object.keys(base_dictionary).forEach(key => {
+        assertTrue(!!mapp.dictionaries[language][key], 
+          `${language} should have ${key}`);
+      });
     });
+  });
+});
 ```
 
-Assertion Functions 🧪
-Codi provides several assertion functions to compare expected and actual values:
+### Available Assertions
+
+Codi provides several built-in assertions:
+
+* `assertEqual(actual, expected, message)` ⚖️
+  * Asserts that the actual value equals the expected value
+* `assertNotEqual(actual, expected, message)` 🙅‍♂️
+  * Asserts that the actual value does not equal the expected value
+* `assertTrue(actual, message)` ✅
+  * Asserts that the actual value is true
+* `assertFalse(actual, message)` ❌
+  * Asserts that the actual value is false
+* `assertThrows(callback, errorMessage, message)` 💥
+  * Asserts that the callback throws an error with the specified message
+* `assertNoDuplicates(callback, errorMessage, message)` 👬
+  * Asserts that there are no duplicates in a provided array.
+
+
+## Best Practices
+
+* Maintain parallel structure between source and test directories
+* Use descriptive test names
+* One describe per test suite
+* Group related tests in the same describe block
+* Use test bundles for reusable configurations
+* Keep tests focused and isolated
+* Use `--quiet` flag in CI/CD pipelines. (can also be used on other test fuctions).
+
+## Common Issues and Solutions
+
+### Test Discovery
+
+Codi automatically discovers tests in files with the pattern:
+
+* `*.test.mjs`
+
+### Error Handling
+
+If tests fail to run:
+
+1. Ensure Bun.sh version is compatible (v1.1.0+ for Codi v0.0.47)
+2. Check file extensions are `.mjs`
+3. Verify import/export syntax is ESM compatible
+4. Confirm test directory structure matches source directories
+5. Verify test settings in xyz_settings/tests/launch.json
+
+For more information, please visit the [Codi GitHub repository](https://github.com/RobAndrewHurst/codi).
+
+## Browser Tests Development Environment Setup
+
+### Build Configuration
+
+Tests require an unminified build to enable debugging and stepping through code. This is handled by the build system (`esbuild.config.mjs`).
+
+Setting process environment `NODE_ENV=DEVELOPMENT` disables minification in build processes.
+
+```javascript
+// esbuild.config.mjs
+import * as esbuild from 'esbuild'
+
+const isDev = process.env.NODE_ENV !== 'DEVELOPMENT';
+
+const buildOptions = {
+    entryPoints: isDev 
+        ? ['./lib/mapp.mjs', './lib/ui.mjs'] 
+        : ['./lib/mapp.mjs', './lib/ui.mjs', './tests/_mapp.test.mjs'],
+    bundle: true,
+    minify: isDev,  // Code won't be minified in development
+    sourcemap: true,
+    sourceRoot: '/lib',
+    format: 'iife',
+    outbase: '.',
+    outdir: 'public/js',
+    metafile: true,
+    logLevel: 'info'
+};
+
+try {
+    await esbuild.build(buildOptions);
+} catch (err) {
+    console.error('Build failed:', err);
+    process.exit(1);
+}
+```
+
+### Running Tests in Development Mode
+
+1. Set the environment variable:
+
+   ```bash
+   NODE_ENV=DEVELOPMENT
+   ```
+
+> This can be defined in your .env or in your nodemon.json config.
+
+2. Build the project:
+
+   ```bash
+   npm run _build
+   ```
+
+3. Verify that:
+   * Test files are included in the build
+   * Source maps are generated
+   * Code is not minified
 
-- `assertEqual(actual, expected, message)`: Asserts that the actual value is equal to the expected value. ⚖️
-- `assertNotEqual(actual, expected, message)`: Asserts that the actual value is not equal to the expected value. 🙅‍♂️
-- `assertTrue(actual, message)`: Asserts that the actual value is true. ✅
-- `assertFalse(actual, message)`: Asserts that the actual value is false. ❌
-- `assertThrows(callback, errorMessage, message)`: Asserts that the provided callback function throws an error with the specified error message. 💥
+4. Launch the application and navigate to `localhost:3000/test?template=test_view`
 
-### cli
+5. Open Chrome DevTools to:
+   * View test results in the console
+   * Debug and step through unminified code
+   * Use source maps for accurate file locations
 
-The directory that you need to add these cli tests are in the `tests/mod` directory. This directory needs to replicate the same kind of structure as the mod directory. Reason we do this is to ensure that test correlates to the position in the project that they are referencing.
+### Debugging Benefits
 
-### module
+The unminified development build provides several advantages:
 
-The directory that you need to add these module tests are in the `tests/lib` directory.
+* Clear, readable code in Chrome DevTools
+* Accurate source mapping to original files
+* Ability to set breakpoints in original source files
+* Step-through debugging from Chrome to VSCode
+* Easier identification of test failures
diff --git a/esbuild.config.mjs b/esbuild.config.mjs
index 1bdeabf39a..20b4c3db54 100644
--- a/esbuild.config.mjs
+++ b/esbuild.config.mjs
@@ -4,13 +4,14 @@ import * as esbuild from 'esbuild'
 const isDev = process.env.NODE_ENV !== 'DEVELOPMENT';
 
 const buildOptions = {
-    entryPoints: ['./lib/mapp.mjs', './lib/ui.mjs'],
+    entryPoints: ['./lib/mapp.mjs', './lib/ui.mjs', './tests/_mapp.test.mjs'],
     bundle: true,
     minify: isDev,
     sourcemap: true,
     sourceRoot: '/lib',
     format: 'iife',
-    outdir: './public/js/lib',
+    outbase: '.',
+    outdir: 'public/js',
     metafile: true,
     logLevel: 'info'
 };
diff --git a/eslint.config.mjs b/eslint.config.mjs
index d5cb190633..5a624d6ea1 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,6 +1,6 @@
 export default [
   {
-    ignores: ['public/js/lib/*', 'docs/**/*'],
+    ignores: ['public/js/**/*', 'docs/**/*'],
   },
   {
     files: ['**/*.js', '**/*.mjs'],
diff --git a/nodemon.json b/nodemon.json
deleted file mode 100644
index 89c1545b1c..0000000000
--- a/nodemon.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "watch": [
-        "lib/**/*",
-        "tests/**/*",
-        "public/css/*",
-        "../xyz_resources/**/*"
-    ],
-    "ext": ".js,.mjs,.json,.css,.svg",
-    "ignore": [
-        "public/js/**/*",
-        "public/css/mapp.css",
-        "public/css/ui.css"
-    ],
-    "env": {
-        "NODE_ENV": "DEVELOPMENT"
-    },
-    "exec": "npx concurrently \"node esbuild.config.mjs\" \"npm run ui_css\" \"npm run mapp_css\"",
-    "events": {
-        "start": "echo \"Watching for changes...\"",
-        "exit": "echo \"Build complete\""
-    }
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index 28b5948bb5..e12873fd15 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "scripts": {
     "test": "codi tests",
     "_build": "node esbuild.config.mjs",
-    "browser-sync": "npx browser-sync start --proxy localhost:3000 --port 3001 --ui-port 3002 --files public/js/lib/**/* --no-open --no-notify",
+    "browser-sync": "npx browser-sync start --proxy localhost:3000 --port 3001 --ui-port 3002 --files public/js/**/* --no-open --no-notify",
     "ui_css": "npx esbuild --bundle public/css/_ui.css --outfile=public/css/ui.css --loader:.svg=dataurl",
     "mapp_css": "npx esbuild --bundle public/css/_mapp.css --outfile=public/css/mapp.css",
     "generate-docs": "jsdoc --configure jsdoc_mapp.json --verbose && jsdoc --configure jsdoc_xyz.json --verbose && jsdoc --configure jsdoc_test.json --verbose",
@@ -33,7 +33,7 @@
     "@eslint/js": "^9.13.0",
     "browser-sync": "^3.0.3",
     "clean-jsdoc-theme": "^4.3.0",
-    "codi-test-framework": "^0.0.33",
+    "codi-test-framework": "^0.0.47",
     "concurrently": "^9.1.0",
     "cookie-parser": "^1.4.5",
     "dotenv": "^16.4.5",
diff --git a/public/tests/layer.test.mjs b/public/tests/layer.test.mjs
index 93207d2ffa..256062e8d8 100644
--- a/public/tests/layer.test.mjs
+++ b/public/tests/layer.test.mjs
@@ -27,7 +27,7 @@ export async function layerTest(mapview) {
                 if (layer.style?.themes) {
 
                     for (const theme in layer.style.themes) {
-                        console.log(`Testing theme ${theme}`);
+                        console.log(`Testing -- Layer: ${layer.key}: Theme: ${theme}`);
                         layer.style.theme = layer.style.themes[theme];
                         layer.reload();
 
diff --git a/public/views/_test.html b/public/views/_test.html
index 2b53d3aca1..7bfd1442c1 100644
--- a/public/views/_test.html
+++ b/public/views/_test.html
@@ -18,13 +18,13 @@
     <script type="importmap">
         {
           "imports": {
-            "codi": "https://esm.sh/codi-test-framework@0.0.33"
+            "codi": "https://esm.sh/codi-test-framework@0.0.47"
           }
-        }
-      </script>
+        } </script>
 
     <script type="module" src="{{dir}}/public/js/lib/mapp.js" defer></script>
     <script type="module" src="{{dir}}/public/js/lib/ui.js" defer></script>
+    <script type="module" src="{{dir}}/public/js/tests/_mapp.test.js" defer></script>
 
     <style>
         html {
@@ -309,23 +309,14 @@
     </div>
 
     <script type="module">
-        import { runWebTests, it, describe, assertEqual, assertNotEqual, assertTrue, assertFalse, assertNoDuplicates } from "codi";
-
-        const _codi = {
-            runWebTests,
-            describe,
-            it,
-            assertEqual,
-            assertNotEqual,
-            assertTrue,
-            assertFalse,
-            assertNoDuplicates
-        };
+
+        import * as _codi from "codi";
 
         self.codi = _codi;
 
         const urlParams = new URLSearchParams(window.location.search);
-        const testFiles = urlParams.get('integrity') ? [`${window.location.origin}{{dir}}/public/tests/integrity.test.mjs`] : [`${window.location.origin}{{dir}}/tests/browser/local.test.mjs`];
+        const integrity = urlParams.get('integrity');
+        const testFiles = integrity ? [`${window.location.origin}{{dir}}/public/tests/integrity.test.mjs`] : [`${window.location.origin}{{dir}}/tests/browser/local.test.mjs`];
 
         try {
 
@@ -353,7 +344,13 @@
                 }
             }
 
-            let results = await runWebTests(testFiles);
+            let results = {};
+
+            if (integrity) {
+                results = await codi.runWebTests(testFiles);
+            } else {
+                results = await codi.runWebTestFunction(_mappTest.coreTest);
+            }
 
             const shouldDownload = urlParams.get('download') === 'true';
 
diff --git a/tests/_mapp.test.mjs b/tests/_mapp.test.mjs
new file mode 100644
index 0000000000..6b261e7f6e
--- /dev/null
+++ b/tests/_mapp.test.mjs
@@ -0,0 +1,39 @@
+import { base } from '../public/tests/_base.test.mjs';
+import { coreTest } from './browser/local.test.mjs';
+import { mappTest } from './lib/mapp.test.mjs';
+import { layerTest } from './lib/layer/_layer.test.mjs';
+import { dictionaryTest } from './lib/dictionaries/_dictionaries.test.mjs';
+import { locationTest } from './lib/location/_location.test.mjs';
+import { mapviewTest } from './lib/mapview/_mapview.test.mjs';
+import { pluginsTest } from './plugins/_plugins.test.mjs';
+import { workspaceTest } from './mod/workspace/_workspace.test.mjs';
+import { queryTest } from './mod/query.test.mjs';
+import { userTest } from './mod/user/_user.test.js';
+import { ui_elementsTest } from './lib/ui/elements/_elements.test.mjs';
+import { ui_layers } from './lib/ui/layers/_layers.test.mjs';
+import { entriesTest } from './lib/ui/locations/entries/_entries.test.mjs';
+import { uiTest } from './lib/ui/_ui.test.mjs';
+import { utilsTest } from './lib/utils/_utils.test.mjs';
+import { formatTest } from './lib/layer/format/_format.test.mjs';
+import { ui_locations } from './lib/ui/locations/_locations.test.mjs';
+
+self._mappTest = {
+    base,
+    coreTest,
+    mappTest,
+    layerTest,
+    dictionaryTest,
+    locationTest,
+    mapviewTest,
+    pluginsTest,
+    workspaceTest,
+    queryTest,
+    userTest,
+    ui_elementsTest,
+    ui_layers,
+    entriesTest,
+    uiTest,
+    utilsTest,
+    formatTest,
+    ui_locations,
+}
\ No newline at end of file
diff --git a/tests/assets/layers/cluster/layer.json b/tests/assets/layers/cluster/layer.json
new file mode 100644
index 0000000000..a9510d70cd
--- /dev/null
+++ b/tests/assets/layers/cluster/layer.json
@@ -0,0 +1,67 @@
+{
+    "key": "cluster_test",
+    "display": true,
+    "group": "layer",
+    "format": "wkt",
+    "dbs": "NEON",
+    "table": "test.scratch",
+    "srid": "3857",
+    "geom": "geom_3857",
+    "qID": "id",
+    "cluster": {
+        "resolution": 0.005,
+        "hexgrid": true
+    },
+    "infoj": [
+        {
+            "type": "pin",
+            "label": "ST_PointOnSurface",
+            "field": "pin",
+            "fieldfx": "ARRAY[ST_X(ST_PointOnSurface(geom_3857)),ST_Y(ST_PointOnSurface(geom_3857))]"
+        }
+    ],
+    "style": {
+        "default": {
+            "icon": {
+                "type": "dot",
+                "fillColor": "#13336B"
+            }
+        },
+        "cluster": {
+            "icon": {
+                "type": "target",
+                "fillColor": "#E6FFFF",
+                "layers": {
+                    "1": "#13336B",
+                    "0.85": "#E6FFFF"
+                }
+            }
+        },
+        "highlight": {
+            "scale": 1.3
+        },
+        "theme": {
+            "title": "theme_1",
+            "type": "graduated",
+            "field": "test_template_style",
+            "graduated_breaks": "greater_than",
+            "template": {
+                "key": "test_template_style",
+                "template": "100-99",
+                "value_only": true
+            },
+            "cat_arr": [
+                {
+                    "value": 0,
+                    "label": "0 to 5%",
+                    "style": {
+                        "icon": {
+                            "fillColor": "#ffffcc",
+                            "fillOpacity": 0.8
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/assets/layers/wkt/infoj.json b/tests/assets/layers/wkt/infoj.json
new file mode 100644
index 0000000000..736bf0e8d8
--- /dev/null
+++ b/tests/assets/layers/wkt/infoj.json
@@ -0,0 +1,27 @@
+{
+    "infoj": [
+        {
+            "title": "qID",
+            "field": "id",
+            "inline": true
+        },
+        {
+            "type": "key"
+        },
+        {
+            "type": "pin",
+            "label": "ST_PointOnSurface",
+            "field": "pin",
+            "fieldfx": "ARRAY[ST_X(ST_PointOnSurface(geom_3857)),ST_Y(ST_PointOnSurface(geom_3857))]"
+        },
+        {
+            "title": "textarea",
+            "field": "textarea",
+            "edit": true
+        },
+        {
+            "title": "char_field",
+            "field": "char_field"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/tests/assets/layers/wkt/layer.json b/tests/assets/layers/wkt/layer.json
new file mode 100644
index 0000000000..e765b81d3f
--- /dev/null
+++ b/tests/assets/layers/wkt/layer.json
@@ -0,0 +1,9 @@
+{
+    "group": "layer",
+    "format": "wkt",
+    "dbs": "NEON",
+    "table": "test.scratch",
+    "srid": "3857",
+    "geom": "geom_3857",
+    "qID": "id"
+}
\ No newline at end of file
diff --git a/tests/assets/layers/wkt/style.json b/tests/assets/layers/wkt/style.json
new file mode 100644
index 0000000000..e72208618d
--- /dev/null
+++ b/tests/assets/layers/wkt/style.json
@@ -0,0 +1,18 @@
+{
+    "style": {
+        "default": {
+            "strokeColor": "#333",
+            "fillColor": "#fff9",
+            "icon": {
+                "type": "dot"
+            }
+        },
+        "cluster": {
+            "clusterScale": 1
+        },
+        "highlight": {
+            "scale": 1.3,
+            "strokeColor": "#090"
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/browser/local.test.mjs b/tests/browser/local.test.mjs
index 2884d3c5ad..7864f89c94 100644
--- a/tests/browser/local.test.mjs
+++ b/tests/browser/local.test.mjs
@@ -1,67 +1,36 @@
-import { base } from '../../public/tests/_base.test.mjs';
-import { mappTest } from '../lib/mapp.test.mjs';
-import { layerTest } from '../lib/layer/_layer.test.mjs';
-import { dictionaryTest } from '../lib/dictionaries/_dictionaries.test.mjs';
-import { locationTest } from '../lib/location/_location.test.mjs';
-import { mapviewTest } from '../lib/mapview/_mapview.test.mjs';
-import { pluginsTest } from '../plugins/_plugins.test.mjs';
-import { workspaceTest } from '../mod/workspace/_workspace.test.mjs'
-import { queryTest } from '../mod/query.test.mjs';
-import { userTest } from '../mod/user/_user.test.js';
-import { ui_elementsTest } from '../lib/ui/elements/_elements.test.mjs';
-
-import { ui_layers } from '../lib/ui/layers/_layers.test.mjs';
-import { entriesTest } from '../lib/ui/locations/entries/_entries.test.mjs';
-import { uiTest } from '../lib/ui/_ui.test.mjs';
-import { utilsTest } from '../lib/utils/_utils.test.mjs';
-import { formatTest } from '../lib/layer/format/_format.test.mjs';
-import { ui_locations } from '../lib/ui/locations/_locations.test.mjs';
-
-//API Tests
-await workspaceTest();
-await queryTest();
-
-await runAllTests(userTest);
-
-const mapview = await base();
-
-await runAllTests(mappTest);
-
-// Run the dictionary Tests
-await runAllTests(dictionaryTest, mapview);
-
-//Plugins Tests
-await runAllTests(pluginsTest);
-
-//Layer Tests
-await runAllTests(layerTest, mapview);
-
-//Location Tests
-await runAllTests(locationTest, mapview);
-
-//Mapview Tests
-await runAllTests(mapviewTest, mapview);
-
-//UI Elements Tests
-await runAllTests(ui_elementsTest, mapview);
-
-//Entries Tests
-await runAllTests(entriesTest, mapview);
-
-//UI Layers Tests
-await runAllTests(ui_layers, mapview);
-
-//UI tests
-await runAllTests(uiTest);
-
-//Format Tests
-await runAllTests(formatTest, mapview);
-
-//UI Locations Tests
-await runAllTests(ui_locations, mapview);
-
-//Utils Tests
-await runAllTests(utilsTest, mapview);
+export async function coreTest() {
+    //API Tests
+    await _mappTest.workspaceTest();
+    await _mappTest.queryTest();
+    const mapview = await _mappTest.base();
+    await runAllTests(_mappTest.userTest);
+    //Run Map Object test
+    await runAllTests(_mappTest.mappTest);
+    // Run the dictionary Tests
+    await runAllTests(_mappTest.dictionaryTest, mapview);
+    //Plugins Tests
+    await runAllTests(_mappTest.pluginsTest);
+    //Layer Tests
+    await runAllTests(_mappTest.layerTest, mapview);
+    //Location Tests
+    await runAllTests(_mappTest.locationTest, mapview);
+    //Mapview Tests
+    await runAllTests(_mappTest.mapviewTest, mapview);
+    //UI Elements Tests
+    await runAllTests(_mappTest.ui_elementsTest, mapview);
+    //Entries Tests
+    await runAllTests(_mappTest.entriesTest, mapview);
+    //UI Layers Tests
+    await runAllTests(_mappTest.ui_layers, mapview);
+    //UI tests
+    await runAllTests(_mappTest.uiTest);
+    //Format Tests
+    await runAllTests(_mappTest.formatTest, mapview);
+    //UI Locations Tests
+    await runAllTests(_mappTest.ui_locations, mapview);
+    //Utils Tests
+    await runAllTests(_mappTest.utilsTest, mapview);
+}
 
 /**
  * This function is used to execute all the test functions on the exported test object. 
diff --git a/tests/lib/dictionaries/baseDictionary.test.mjs b/tests/lib/dictionaries/baseDictionary.test.mjs
index 8d5ce15746..58c1fe63ca 100644
--- a/tests/lib/dictionaries/baseDictionary.test.mjs
+++ b/tests/lib/dictionaries/baseDictionary.test.mjs
@@ -3,8 +3,8 @@
  * This test is used to see if all the language options at least have all of these base entries.
  * @function baseDictionaryTest
  */
-export function baseDictionaryTest() {
-    codi.describe('All languages should have the same base language entries', () => {
+export async function baseDictionaryTest() {
+    await codi.describe('All languages should have the same base language entries', async () => {
 
         const base_dictionary = {
             save: '',
@@ -15,7 +15,7 @@ export function baseDictionaryTest() {
         };
 
         for (const language of Object.keys(mapp.dictionaries)) {
-            codi.it(`${language} dictionary should have all the base keys`, () => {
+            await codi.it(`${language} dictionary should have all the base keys`, () => {
                 for (const key of Object.keys(base_dictionary)) {
                     codi.assertTrue(!!mapp.dictionaries[language][key], `${language} should have ${key}`);
                 }
diff --git a/tests/lib/dictionaries/keyValueDictionary.test.mjs b/tests/lib/dictionaries/keyValueDictionary.test.mjs
index 7e62a16777..3262d08f3b 100644
--- a/tests/lib/dictionaries/keyValueDictionary.test.mjs
+++ b/tests/lib/dictionaries/keyValueDictionary.test.mjs
@@ -3,17 +3,17 @@
  * @description This test is used to see if the key value dictionary is working correctly
  * @function keyValueDictionaryTest
  */
-export function keyValueDictionaryTest(mapview) {
-    codi.describe('Key Value Dictionary Tests', () => {
+export async function keyValueDictionaryTest(mapview) {
+    await codi.describe('Key Value Dictionary Tests', async () => {
 
-        codi.it('should replace the key value dictionary for default value on a layer', () => {
+        await codi.it('should replace the key value dictionary for default value on a layer', () => {
             // Get the OSM layer from the mapview
             const osm = mapview.locale.layers.find(layer => layer.key === 'OSM');
             // Check the OSM layer has the correct name
             codi.assertEqual(osm.name, 'OpenStreetMap KeyValue Dictionary');
         });
 
-        codi.it('should replace the key value dictionary for default value in an infoj', () => {
+        await codi.it('should replace the key value dictionary for default value in an infoj', () => {
             // Get the changeEnd layer from the mapview
             const changeEnd = mapview.locale.layers.find(layer => layer.key === 'changeEnd');
             // Check the changeEnd infoj entry of field textarea has the correct title
@@ -23,7 +23,7 @@ export function keyValueDictionaryTest(mapview) {
 
         });
 
-        codi.it('should not replace the key value dictionary for an array', () => {
+        await codi.it('should not replace the key value dictionary for an array', () => {
             // Get the changeEnd layer from the mapview
             const changeEnd = mapview.locale.layers.find(layer => layer.key === 'changeEnd');
             // Check the changeEnd test_array has the correct value
diff --git a/tests/lib/dictionaries/unknownLanguageTest.test.mjs b/tests/lib/dictionaries/unknownLanguageTest.test.mjs
index e10e19b269..b8eb0fca57 100644
--- a/tests/lib/dictionaries/unknownLanguageTest.test.mjs
+++ b/tests/lib/dictionaries/unknownLanguageTest.test.mjs
@@ -3,14 +3,14 @@
  * If not, it should return a warning and default to 'en'.
  * @function unknownLanguageTest
  */
-export function unknownLanguageTest() {
+export async function unknownLanguageTest() {
     // Describe the test
-    codi.describe('Language TEST should default language to English', () => {
+    await codi.describe('Language TEST should default language to English', async () => {
 
         // The language was set to 'TEST' in _test.html, which is not a valid language
 
         // Assert that the language has been reset to 'en'
-        codi.it('Should default to English', () => {
+        await codi.it('Should default to English', () => {
             codi.assertEqual(mapp.language, 'en');
         });
     });
diff --git a/tests/lib/layer/decorate.test.mjs b/tests/lib/layer/decorate.test.mjs
index 550baf6854..aebc14a88b 100644
--- a/tests/lib/layer/decorate.test.mjs
+++ b/tests/lib/layer/decorate.test.mjs
@@ -3,6 +3,9 @@
  * @module layer/decorateTest
  */
 import { setView } from '../../utils/view.js';
+import wkt_layer_default from '../../assets/layers/wkt/layer.json'
+import wkt_infoj_default from '../../assets/layers/wkt/infoj.json'
+import wkt_style_default from '../../assets/layers/wkt/style.json'
 
 /**
  * This function is used as an entry point for the decorateTest
@@ -15,15 +18,29 @@ import { setView } from '../../utils/view.js';
  * @function decorateTest 
  * @param {Object} mapview 
 */
-export async function decorateTest(mapview) {
+export async function decorateTest(mapview, layer, infoj, style) {
 
-    setView(mapview, 2, 'default');
+    layer ??= wkt_layer_default;
+    infoj ??= wkt_infoj_default;
+    style ??= wkt_style_default;
+
+    await setView(mapview, 2, 'default');
 
     await codi.describe('Layer: decorateTest', async () => {
-        const decorated_layer = mapview.layers['decorate'];
-        const workspace_layer = await mapp.utils.xhr(`/test/api/workspace/layer?layer=decorate`);
-        workspace_layer.mapview = mapview;
-        const layer = await mapp.layer.decorate(workspace_layer);
+
+        const infoj_skip = [
+            'textarea'
+        ]
+
+        layer = {
+            mapview: mapview,
+            ...infoj,
+            infoj_skip: infoj_skip,
+            ...style,
+            ...layer
+        }
+
+        await mapp.layer.decorate(layer);
 
         /**
          * ### Should have a draw object
@@ -31,7 +48,7 @@ export async function decorateTest(mapview) {
          * @function it
          */
         await codi.it('Should have a draw object', async () => {
-            codi.assertTrue(!!layer.draw, 'The layer should have a draw object by default')
+            codi.assertTrue(Object.hasOwn(layer, 'draw'), 'The layer should have a draw object by default')
         });
 
         /**
@@ -42,10 +59,10 @@ export async function decorateTest(mapview) {
          * @function it
          */
         await codi.it('Should have a show function', async () => {
-            codi.assertTrue(!!layer.show, 'The layer should have a show method by default');
-
-            decorated_layer.show();
-            codi.assertTrue(decorated_layer.display, 'The layer should display as true');
+            codi.assertTrue(Object.hasOwn(layer, 'show'), 'The layer should have a show method by default');
+            codi.assertTrue(typeof layer.display === 'undefined', 'The layer shouldn\'t have a display flag');
+            layer.show();
+            codi.assertTrue(layer.display, 'The layer should now display true after displaying');
         });
 
         /**
@@ -56,10 +73,9 @@ export async function decorateTest(mapview) {
          * @function it
          */
         await codi.it('Should have a hide function', async () => {
-            codi.assertTrue(!!layer.hide, 'The layer should have a hide method by default')
-
-            decorated_layer.hide();
-            codi.assertFalse(decorated_layer.display, 'The layer should display as false');
+            codi.assertTrue(Object.hasOwn(layer, 'hide'), 'The layer should have a hide method by default')
+            layer.hide();
+            codi.assertFalse(layer.display, 'The layer should display as false');
         });
 
         /**
@@ -82,7 +98,7 @@ export async function decorateTest(mapview) {
             });
         });
 
-        setView(mapview, 11, 'london');
+        await setView(mapview, 11, 'london');
 
         /**
          * ### Should get `test.public` table at zoom level 11.
@@ -90,8 +106,8 @@ export async function decorateTest(mapview) {
          * 2. We assert that the table returned is zool level 11.
          */
         await codi.it('Should get test.public table at zoom level 11', async () => {
-            const table = decorated_layer.tableCurrent();
-            codi.assertEqual(table, 'test.scratch')
+            const table = layer.tableCurrent();
+            codi.assertTrue(typeof table === 'string');
         });
 
         /**
@@ -101,8 +117,8 @@ export async function decorateTest(mapview) {
          * @function it
          */
         await codi.it('Should get geom_3857 geom at zoom level 11', async () => {
-            const geom = decorated_layer.geomCurrent();
-            codi.assertEqual(geom, 'geom_3857', 'The Geometry at zoom level 11 should be geom_3857')
+            const geom = layer.geomCurrent();
+            codi.assertTrue(typeof geom === 'string', 'The geometry should be returned from the layer')
         });
 
         /**
@@ -111,8 +127,9 @@ export async function decorateTest(mapview) {
          * 2. We assert that the return is a success.
          */
         await codi.it('Should be able to zoomToExtent', async () => {
-            const success = await decorated_layer.zoomToExtent();
-            codi.assertTrue(success)
+            const success = await layer.zoomToExtent();
+            codi.assertTrue(success, 'We should see the layer zoom to extent')
         });
+
     });
 }
\ No newline at end of file
diff --git a/tests/lib/layer/fade.test.mjs b/tests/lib/layer/fade.test.mjs
index 6c75ec3002..1e2030b388 100644
--- a/tests/lib/layer/fade.test.mjs
+++ b/tests/lib/layer/fade.test.mjs
@@ -1,6 +1,6 @@
 import { setView } from '../../utils/view.js';
 export async function fadeTest(mapview) {
-    setView(mapview, 2, 'default');
+    await setView(mapview, 2, 'default');
     await codi.describe('TODO: Layer: fadeTest', async () => {
         await codi.it('Should should test for something', () => {
             console.warn('The Fade module needs to be re-reviewed.')
diff --git a/tests/lib/layer/format/mvt.test.mjs b/tests/lib/layer/format/mvt.test.mjs
index 305b91d91d..06dafb74e6 100644
--- a/tests/lib/layer/format/mvt.test.mjs
+++ b/tests/lib/layer/format/mvt.test.mjs
@@ -1,155 +1,21 @@
-export function mvtTest() {
-    codi.describe('Layer Format: MVT', () => {
-        const mvt_layer = {
-            'group': 'layer',
-            'name': 'mvt_test',
-            'format': 'mvt',
-            'table': 'test.mvt_test',
-            'geom': 'geom_3857',
-            'srid': '3857',
-            'qID': 'id',
-            'infoj': [
-                {
-                    'type': 'pin',
-                    'label': 'ST_PointOnSurface',
-                    'field': 'pin',
-                    'fieldfx': 'ARRAY[ST_X(ST_PointOnSurface(geom_3857)),ST_Y(ST_PointOnSurface(geom_3857))]'
-                }
-            ],
-            'style': {
-                'default': {
-                    'strokeWidth': '0',
-                    'fillColor': '#fff',
-                    'fillOpacity': 0.4,
-                    'strokeColor': null
-                },
-                'themes': {
-                    'theme_1': {
-                        'title': 'theme_1',
-                        'type': 'categorized',
-                        'field': 'numeric_field',
-                        'cat': {
-                            '1': {
-                                'label': 'Lowest',
-                                'style': {
-                                    'fillColor': '#3193ED'
-                                }
-                            },
-                            '2': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#5DC29A'
-                                }
-                            },
-                            '3': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#8FE15A'
-                                }
-                            },
-                            '4': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#D8D758'
-                                }
-                            },
-                            '5': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#FFB956'
-                                }
-                            },
-                            '6': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#FE8355'
-                                }
-                            },
-                            '7': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#FA5652'
-                                }
-                            },
-                            '8': {
-                                'label': 'Highest',
-                                'style': {
-                                    'fillColor': '#F0304D'
-                                }
-                            }
-                        }
-                    },
-                    'theme_2': {
-                        'title': 'theme_2',
-                        'type': 'categorized',
-                        'field': 'numeric_field',
-                        'cat': {
-                            '1': {
-                                'label': 'Lowest',
-                                'style': {
-                                    'fillColor': '#6B2E94'
-                                }
-                            },
-                            '2': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#8B44B8'
-                                }
-                            },
-                            '3': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#9B6FCD'
-                                }
-                            },
-                            '4': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#89A7D6'
-                                }
-                            },
-                            '5': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#70C1C9'
-                                }
-                            },
-                            '6': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#52C4A3'
-                                }
-                            },
-                            '7': {
-                                'label': '-',
-                                'style': {
-                                    'fillColor': '#38B77C'
-                                }
-                            },
-                            '8': {
-                                'label': 'Highest',
-                                'style': {
-                                    'fillColor': '#1FA855'
-                                }
-                            }
-                        }
-                    }
-                }
-            }
+import mvt_layer_default from '../../../assets/layers/mvt/layer.json';
+
+export function mvtTest(mapview, layer) {
 
-        }
+    layer ??= mvt_layer_default;
 
+    codi.describe('Layer Format: MVT', () => {
         /**
          * @description MVT: Create basic layer
          * @function it
          */
         codi.it('MVT: Create basic layer', () => {
-            mapp.layer.formats[mvt_layer.format]?.(mvt_layer);
+            mapp.layer.formats[layer.format]?.(layer);
 
-            codi.assertTrue(Object.hasOwn(mvt_layer, 'reload'), 'The mvt layer needs to have a reload function')
-            codi.assertTrue(Object.hasOwn(mvt_layer, 'featureSource'), 'The mvt layer needs to have a featureSource')
-            codi.assertTrue(Object.hasOwn(mvt_layer, 'source'), 'The mvt layer needs to have a source')
-            codi.assertTrue(Object.hasOwn(mvt_layer, 'L'), 'The mvt layer needs to have an openlayer object')
+            codi.assertTrue(Object.hasOwn(layer, 'reload'), 'The mvt layer needs to have a reload function')
+            codi.assertTrue(Object.hasOwn(layer, 'featureSource'), 'The mvt layer needs to have a featureSource')
+            codi.assertTrue(Object.hasOwn(layer, 'source'), 'The mvt layer needs to have a source')
+            codi.assertTrue(Object.hasOwn(layer, 'L'), 'The mvt layer needs to have an openlayer object')
         });
 
         /**
@@ -157,11 +23,11 @@ export function mvtTest() {
          * @function it
          */
         codi.it('MVT: Reload should remove sourceTiles', () => {
-            mapp.layer.formats[mvt_layer.format]?.(mvt_layer);
+            mapp.layer.formats[layer.format]?.(layer);
 
-            mvt_layer.source.sourceTiles_ = { tile: 'foo' };
-            mvt_layer.reload();
-            codi.assertEqual(mvt_layer.source.sourceTiles_, {}, 'The sourceTiles needs to be cleared');
+            layer.source.sourceTiles_ = { tile: 'foo' };
+            layer.reload();
+            codi.assertEqual(layer.source.sourceTiles_, {}, 'The sourceTiles needs to be cleared');
         });
     });
 }
\ No newline at end of file
diff --git a/tests/lib/layer/format/vector.test.mjs b/tests/lib/layer/format/vector.test.mjs
index 83bb86b674..5382f83a2d 100644
--- a/tests/lib/layer/format/vector.test.mjs
+++ b/tests/lib/layer/format/vector.test.mjs
@@ -3,13 +3,18 @@
  * @module layer/format/vector
  */
 
+import cluster_layer_default from '../../../assets/layers/cluster/layer.json';
+
 /**
  * This is the entry point function for the vector test module.
  * @function vectorTest 
  * @param {object} mapview 
  */
-export async function vectorTest(mapview) {
-    await codi.describe('Layer Format: Vector', () => {
+export async function vectorTest(mapview, layer) {
+
+    layer ??= cluster_layer_default;
+
+    await codi.describe('Layer Format: Vector', async () => {
 
         /**
          * ### Should be able to create a cluster layer
@@ -19,89 +24,26 @@ export async function vectorTest(mapview) {
          * 4. We expect the format of the layer to change to 'cluster'
          * @function it
          */
-        codi.it('Should create a cluster layer', async () => {
+        await codi.it('Should create a cluster layer', async () => {
+
             const layer_params = {
                 mapview: mapview,
-                'key': 'cluster_test',
-                'display': true,
-                'group': 'layer',
-                'format': 'wkt', //This should change to cluster when used in the vector function
-                'dbs': 'NEON',
-                'table': 'test.scratch',
-                'srid': '3857',
-                'geom': 'geom_3857',
-                'qID': 'id',
-                'cluster': {
-                    'resolution': 0.005,
-                    'hexgrid': true
-                },
-                'infoj': [
-                    {
-                        'type': 'pin',
-                        'label': 'ST_PointOnSurface',
-                        'field': 'pin',
-                        'fieldfx': 'ARRAY[ST_X(ST_PointOnSurface(geom_3857)),ST_Y(ST_PointOnSurface(geom_3857))]'
-                    }
-                ],
-                'style': {
-                    'default': {
-                        'icon': {
-                            'type': 'dot',
-                            'fillColor': '#13336B'
-                        }
-                    },
-                    'cluster': {
-                        'icon': {
-                            'type': 'target',
-                            'fillColor': '#E6FFFF',
-                            'layers': {
-                                '1': '#13336B',
-                                '0.85': '#E6FFFF'
-                            }
-                        }
-                    },
-                    'highlight': {
-                        'scale': 1.3
-                    },
-                    'theme': {
-                        'title': 'theme_1',
-                        'type': 'graduated',
-                        'field': 'test_template_style',
-                        'graduated_breaks': 'greater_than',
-                        'template': {
-                            'key': 'test_template_style',
-                            'template': '100-99',
-                            'value_only': true
-                        },
-                        'cat_arr': [
-                            {
-                                'value': 0,
-                                'label': '0 to 5%',
-                                'style': {
-                                    'icon': {
-                                        'fillColor': '#ffffcc',
-                                        'fillOpacity': 0.8
-                                    }
-                                }
-                            }
-                        ]
-                    }
-                }
+                ...layer
             }
 
             //Decorating layer
-            const layer = await mapp.layer.decorate(layer_params);
+            const clusterLayer = await mapp.layer.decorate(layer_params);
 
             //Passing the layer to the format method
-            mapp.layer.formats.vector(layer);
+            mapp.layer.formats.vector(clusterLayer);
 
             //Showing the layer
-            layer.show();
-            codi.assertTrue(typeof layer.show === 'function', 'The layer should have a show function');
-            codi.assertTrue(typeof layer.reload === 'function', 'The layer should have a reload function');
-            codi.assertTrue(typeof layer.setSource === 'function', 'The layer should have a setSource function');
-            codi.assertTrue(layer.format === 'cluster', 'The layer should have the format cluster');
-            layer.hide();
+            clusterLayer.show();
+            codi.assertTrue(typeof clusterLayer.show === 'function', 'The layer should have a show function');
+            codi.assertTrue(typeof clusterLayer.reload === 'function', 'The layer should have a reload function');
+            codi.assertTrue(typeof clusterLayer.setSource === 'function', 'The layer should have a setSource function');
+            codi.assertTrue(clusterLayer.format === 'cluster', 'The layer should have the format cluster');
+            clusterLayer.hide();
         });
     });
 }
\ No newline at end of file
diff --git a/tests/lib/location/create.test.mjs b/tests/lib/location/create.test.mjs
index 97d6f6d2f2..7897a9fd95 100644
--- a/tests/lib/location/create.test.mjs
+++ b/tests/lib/location/create.test.mjs
@@ -1,7 +1,9 @@
 export async function createTest() {
-    codi.describe('TODO: Location: createTest', () => {
-        codi.it('Should should test for something', () => {
-            //TODO
-        });
-    });
+
+    //     codi.describe('TODO: Location: createTest', () => {
+    //         codi.it('Should should test for something', () => {
+    //             //TODO
+    //         });
+    //    });
+
 }
diff --git a/tests/lib/mapview/_mapview.test.mjs b/tests/lib/mapview/_mapview.test.mjs
index f3ddb7ee38..acce24d948 100644
--- a/tests/lib/mapview/_mapview.test.mjs
+++ b/tests/lib/mapview/_mapview.test.mjs
@@ -8,15 +8,7 @@ import { getBoundsTest } from './getBounds.test.mjs';
 import { infotipTest } from './infotip.test.mjs';
 import { locateTest } from './locate.test.mjs';
 import { popupTest } from './popup.test.mjs';
-
-export async function olControlsTest(mapview) {
-    await codi.describe('Mapview', async () => {
-        codi.it('The Mapview should have controls', () => {
-            codi.assertTrue(mapview.controls.length >= 1, 'The ol controls array should be greater or equal to 1');
-        });
-    });
-};
-
+import { olControlsTest } from './olcontrols.test.mjs';
 
 export const mapviewTest = {
     olControlsTest,
diff --git a/tests/lib/mapview/allfeatures.test.mjs b/tests/lib/mapview/allfeatures.test.mjs
index fdf74bec9a..00b92292e4 100644
--- a/tests/lib/mapview/allfeatures.test.mjs
+++ b/tests/lib/mapview/allfeatures.test.mjs
@@ -1,7 +1,7 @@
 export async function allfeaturesTest() {
-    codi.describe('TODO: Mapview: allfeaturesTest', () => {
-        codi.it('Should should test for something', () => {
-            //TODO
-        });
-    });
+    // await codi.describe('TODO: Mapview: allfeaturesTest', async () => {
+    //     await codi.it('Should should test for something', () => {
+    //         //TODO
+    //     });
+    // });
 }
diff --git a/tests/lib/mapview/attribution.test.mjs b/tests/lib/mapview/attribution.test.mjs
index 33e654e93d..7d2fe71e4a 100644
--- a/tests/lib/mapview/attribution.test.mjs
+++ b/tests/lib/mapview/attribution.test.mjs
@@ -1,7 +1,9 @@
 export async function attributionTest() {
-    codi.describe('TODO: Mapview: attributionTest', () => {
-        codi.it('Should should test for something', () => {
-            //TODO
-        });
-    });
+
+    // codi.describe('TODO: Mapview: attributionTest', () => {
+    //     codi.it('Should should test for something', () => {
+    //         //TODO
+    //     });
+    // });
+
 }
diff --git a/tests/lib/mapview/fitView.test.mjs b/tests/lib/mapview/fitView.test.mjs
index 762bf72fe3..32bed7e0a1 100644
--- a/tests/lib/mapview/fitView.test.mjs
+++ b/tests/lib/mapview/fitView.test.mjs
@@ -1,7 +1,9 @@
 export async function fitViewTest() {
-    codi.describe('TODO: Mapview: fitViewTest', () => {
-        codi.it('Should should test for something', () => {
-            //TODO
-        });
-    });
+
+    // codi.describe('TODO: Mapview: fitViewTest', () => {
+    //     codi.it('Should should test for something', () => {
+    //         //TODO
+    //     });
+    // });
+
 }
diff --git a/tests/lib/mapview/geojson.test.mjs b/tests/lib/mapview/geojson.test.mjs
index eb6fcaeaa3..3ff16529f3 100644
--- a/tests/lib/mapview/geojson.test.mjs
+++ b/tests/lib/mapview/geojson.test.mjs
@@ -1,7 +1,9 @@
 export async function geoJSONTest() {
-    codi.describe('TODO: Mapview: geoJSONTest', () => {
-        codi.it('Should should test for something', () => {
-            //TODO
-        });
-    });
+
+    // codi.describe('TODO: Mapview: geoJSONTest', () => {
+    //     codi.it('Should should test for something', () => {
+    //         //TODO
+    //     });
+    // });
+
 }
diff --git a/tests/lib/mapview/geometry.test.mjs b/tests/lib/mapview/geometry.test.mjs
index 3aedadbda9..9ab15f18b9 100644
--- a/tests/lib/mapview/geometry.test.mjs
+++ b/tests/lib/mapview/geometry.test.mjs
@@ -1,7 +1,9 @@
 export async function geometryTest() {
-    codi.describe('TODO: Mapview: geometryTest', () => {
-        codi.it('Should should test for something', () => {
-            //TODO
-        });
-    });
+
+    // codi.describe('TODO: Mapview: geometryTest', () => {
+    //     codi.it('Should should test for something', () => {
+    //         //TODO
+    //     });
+    // });
+
 }
diff --git a/tests/lib/mapview/getBounds.test.mjs b/tests/lib/mapview/getBounds.test.mjs
index d62447f83f..a8c05d5ac2 100644
--- a/tests/lib/mapview/getBounds.test.mjs
+++ b/tests/lib/mapview/getBounds.test.mjs
@@ -1,7 +1,9 @@
 export async function getBoundsTest() {
-    codi.describe('TODO: Mapview: getBoundsTest', () => {
-        codi.it('Should should test for something', () => {
-            //TODO
-        });
-    });
+
+    // codi.describe('TODO: Mapview: getBoundsTest', () => {
+    //     codi.it('Should should test for something', () => {
+    //         //TODO
+    //     });
+    // });
+
 }
diff --git a/tests/lib/mapview/infotip.test.mjs b/tests/lib/mapview/infotip.test.mjs
index 80256a0d25..95f705306a 100644
--- a/tests/lib/mapview/infotip.test.mjs
+++ b/tests/lib/mapview/infotip.test.mjs
@@ -1,7 +1,9 @@
 export async function infotipTest() {
-    codi.describe('TODO: Mapview: infotipTest', () => {
-        codi.it('Should should test for something', () => {
-            //TODO
-        });
-    });
+
+    // codi.describe('TODO: Mapview: infotipTest', () => {
+    //     codi.it('Should should test for something', () => {
+    //         //TODO
+    //     });
+    // });
+
 }
diff --git a/tests/lib/mapview/locate.test.mjs b/tests/lib/mapview/locate.test.mjs
index 04734adb28..db6f757152 100644
--- a/tests/lib/mapview/locate.test.mjs
+++ b/tests/lib/mapview/locate.test.mjs
@@ -1,7 +1,9 @@
 export async function locateTest() {
-    codi.describe('TODO: Mapview: locateTest', () => {
-        codi.it('Should should test for something', () => {
-            //TODO
-        });
-    });
+
+    // codi.describe('TODO: Mapview: locateTest', () => {
+    //     codi.it('Should should test for something', () => {
+    //         //TODO
+    //     });
+    // })
+
 }
diff --git a/tests/lib/mapview/olcontrols.test.mjs b/tests/lib/mapview/olcontrols.test.mjs
new file mode 100644
index 0000000000..8328f1fab4
--- /dev/null
+++ b/tests/lib/mapview/olcontrols.test.mjs
@@ -0,0 +1,8 @@
+
+export async function olControlsTest(mapview) {
+    await codi.describe('Mapview', async () => {
+        await codi.it('The Mapview should have controls', () => {
+            codi.assertTrue(mapview.controls.length >= 1, 'The ol controls array should be greater or equal to 1');
+        });
+    });
+};
\ No newline at end of file
diff --git a/tests/lib/mapview/popup.test.mjs b/tests/lib/mapview/popup.test.mjs
index 0451b02f44..e001dd789e 100644
--- a/tests/lib/mapview/popup.test.mjs
+++ b/tests/lib/mapview/popup.test.mjs
@@ -1,7 +1,9 @@
 export async function popupTest() {
-    codi.describe('TODO: Mapview: popupTest', () => {
-        codi.it('Should should test for something', () => {
-            //TODO
-        });
-    });
+
+    // codi.describe('TODO: Mapview: popupTest', () => {
+    //     codi.it('Should should test for something', () => {
+    //         //TODO
+    //     });
+    // });
+
 }
diff --git a/tests/lib/ui/Tabview.test.mjs b/tests/lib/ui/Tabview.test.mjs
index 996ca9bdff..bc801c15f2 100644
--- a/tests/lib/ui/Tabview.test.mjs
+++ b/tests/lib/ui/Tabview.test.mjs
@@ -3,67 +3,7 @@
  * @function Tabview 
  */
 export async function Tabview() {
-
-    await codi.describe('UI Test: Tabview', async () => {
-
-        const tabview = document.getElementById('Tabview');
-
-        const tabs = document.querySelector('#Tabview > div.tabs');
-
-        const panel = document.querySelector('#Tabview > div.panel');
-
-        await codi.it('should create a tabview object', () => {
-
-            // Check the tabview object exists
-            codi.assertTrue(tabview !== undefined, 'Tabview should exist');
-        });
-
-        await codi.it('should create a tabview with two children, tabs and panel', () => {
-            // tabview.children should contain div.tabs and div.panel
-            codi.assertEqual(tabview.children.length, 2, 'Should be two children');
-            codi.assertTrue(tabview.children[0].classList.contains('tabs'), 'First child should be tabs');
-            codi.assertTrue(tabview.children[1].classList.contains('panel'), 'Second child should be panel');
-
-        })
-        await codi.it('should create a tabview object with two tabs', () => {
-            // Check that the tabview object contains a tabs div with two children
-            codi.assertEqual(tabs.children.length, 2, 'Should be two children tabs');
-
-        });
-
-        await codi.it('should create a tabview with two tabs with buttons', () => {
-            // Check if the first tab has a button inside
-            const firstTab = tabs.children[0];
-            const buttonInFirstTab = firstTab.querySelector('button');
-
-            codi.assertTrue(!!buttonInFirstTab, 'First tab should contain a button');
-
-            // Check if the second tab has a button inside
-            const secondTab = tabs.children[1];
-            const buttonInSecondTab = secondTab.querySelector('button');
-
-            codi.assertTrue(!!buttonInSecondTab, 'Second tab should contain a button');
-        });
-
-        await codi.it('should create a tabview object with the second tab active', () => {
-            // Check that the first child has the active class
-            codi.assertTrue(tabs.children[1].classList.contains('active'), 'Second tab should have the active class');
-        });
-
-        await codi.it('should create a tabview object with two tabs with the correct button header label', () => {
-            // Strip any \n or whitespace and check the content of the first tab
-            const firstTabContent = tabs.children[0].innerText.trim();
-            const secondTabContent = tabs.children[1].innerText.trim();
-
-            codi.assertEqual(firstTabContent, 'json_1', 'First tab should have content of json_1');
-            codi.assertEqual(secondTabContent, 'json_2', 'Second tab should have content of json_2');
-        });
-
-        await codi.it('The panel should have the correct value based on the query response', () => {
-            // Check that the content is "{"value":2012}"
-            codi.assertEqual(panel.textContent, '{"value":2012}', `Panel should have content of "{"value":2012}", actual content is ${panel.textContent}`);
-        });
-
-    }
-    )
+    // await codi.describe('UI Test: Tabview', async () => {
+    //     console.warn('These tests need to be rewritten');
+    // });
 };
\ No newline at end of file
diff --git a/tests/lib/ui/layers/view.test.mjs b/tests/lib/ui/layers/view.test.mjs
index ddf9cabadf..677d0c2d45 100644
--- a/tests/lib/ui/layers/view.test.mjs
+++ b/tests/lib/ui/layers/view.test.mjs
@@ -14,7 +14,7 @@ import { delayFunction } from '../../../utils/delay.js';
 */
 export async function viewTest(mapview) {
 
-    setView(mapview, 2, 'default');
+    await setView(mapview, 2, 'default');
 
     await codi.describe('UI Layers: viewTest', async () => {
 
@@ -44,7 +44,7 @@ export async function viewTest(mapview) {
          * @function it
          */
         await codi.it('should display at zoom level 6', async () => {
-            setView(mapview, 11, 'london')
+            await setView(mapview, 11, 'london')
             const layer = mapview.layers['changeEnd'];
             const changeEndEvent = new Event('changeEnd');
             const target = layer.mapview.Map.getTargetElement();
diff --git a/tests/lib/ui/locations/entries/layer.test.mjs b/tests/lib/ui/locations/entries/layer.test.mjs
index 75ca6ed0ab..d638edd62b 100644
--- a/tests/lib/ui/locations/entries/layer.test.mjs
+++ b/tests/lib/ui/locations/entries/layer.test.mjs
@@ -77,12 +77,12 @@ export async function layerTest(mapview) {
                 'layer': 'mvt_test',
                 'tables': {
                     '12': null,
-                    '13':'test.mvt_test'
+                    '13': 'test.mvt_test'
                 }
             };
 
             //Zoom out
-            setView(mapview, 11, 'london');
+            await setView(mapview, 11, 'london');
 
             await mapp.ui.locations.entries.layer(newEntry);
 
@@ -92,7 +92,7 @@ export async function layerTest(mapview) {
             codi.assertTrue(mapview.layers[newEntry.key].display_toggle.classList.contains('disabled'), 'Toggle should be disabled')
 
             //Zoom in
-            setView(mapview, 14, 'london');
+            await setView(mapview, 14, 'london');
 
             codi.assertFalse(!mapview.layers[newEntry.key].display_toggle.classList.contains('disabled'), 'Toggle should be enabled')
 
diff --git a/tests/lib/utils/numericFormatter.test.mjs b/tests/lib/utils/numericFormatter.test.mjs
index e5ee9c7b09..2f9494540f 100644
--- a/tests/lib/utils/numericFormatter.test.mjs
+++ b/tests/lib/utils/numericFormatter.test.mjs
@@ -6,9 +6,9 @@
  * This function is used as an entry point for the numericFormatter Test
  * @function numericFormatterTest
  */
-export async function numericFormatterTest() {
+export function numericFormatterTest() {
 
-    await codi.describe('Utils: numericFormatter Test', async () => {
+    codi.describe('Utils: numericFormatter Test', () => {
         const params = {
             value: 654321.987,
             prefix: '$',
@@ -24,7 +24,7 @@ export async function numericFormatterTest() {
          * This test is used to check if a numeric value gets formatted to the correct localised UK string.
          * @function it
          */
-        await codi.it('Should format UK locale Numeric Values', async () => {
+        codi.it('Should format UK locale Numeric Values', () => {
 
             const formattedValue = mapp.utils.formatNumericValue(params);
             codi.assertEqual(formattedValue, expected_formated_value, `We expect the value to equal ${expected_formated_value}, we received ${formattedValue}`)
@@ -34,7 +34,7 @@ export async function numericFormatterTest() {
          * This test is used to check if a localised string to UK returns the correct string.
          * @function it
          */
-        await codi.it('Should unformat UK locale strings', async () => {
+        codi.it('Should unformat UK locale strings', () => {
 
             const unformattedString = mapp.utils.unformatStringValue(params)
             codi.assertEqual(unformattedString, expected_unformated_value, `We expect the value to equal ${expected_unformated_value}, we received ${unformattedString}`)
@@ -44,7 +44,7 @@ export async function numericFormatterTest() {
          * This test is used to check if a numeric value gets formatted to the correct localised DE string.
          * @function it
          */
-        await codi.it('Should format DE locale Numeric Values', async () => {
+        codi.it('Should format DE locale Numeric Values', () => {
             //Settings the locale to 'DE'
             params.formatterParams.locale = 'DE';
             expected_formated_value = '$654.321,99'
@@ -57,7 +57,7 @@ export async function numericFormatterTest() {
          * This test is used to check if a localised string to DE returns the correct string.
          * @function it
          */
-        await codi.it('Should unformat DE locale strings', async () => {
+        codi.it('Should unformat DE locale strings', () => {
 
             const unformattedString = mapp.utils.unformatStringValue(params)
             codi.assertEqual(unformattedString, expected_unformated_value, `We expect the value to equal ${expected_unformated_value}, we received ${unformattedString}`)
@@ -68,7 +68,7 @@ export async function numericFormatterTest() {
          * This test is used to check if a numeric value gets formatted to the correct localised PL string.
          * @function it
          */
-        await codi.it('Should format PL locale Numeric Values', async () => {
+        codi.it('Should format PL locale Numeric Values', () => {
             //Settings the locale to 'DE'
             params.formatterParams.locale = 'PL';
             expected_formated_value = '$654 321,99'
@@ -77,7 +77,7 @@ export async function numericFormatterTest() {
             codi.assertEqual(formattedValue, expected_formated_value, `We expect the value to equal ${expected_formated_value}, we received ${formattedValue}`)
         });
 
-        await codi.it('Should unformat PL locale strings', async () => {
+        codi.it('Should unformat PL locale strings', () => {
             mapp.utils.formatNumericValue(params);
 
             const unformattedString = mapp.utils.unformatStringValue(params)
@@ -89,7 +89,7 @@ export async function numericFormatterTest() {
          * This test is used to check if a numeric value gets formatted to the correct localised PL string.
          * @function it
          */
-        await codi.it('Should format RUB locale Numeric Values', async () => {
+        codi.it('Should format RUB locale Numeric Values', () => {
             //Settings the locale to 'DE'
             params.formatterParams.locale = 'RUB';
             expected_formated_value = '$654,321.99';
@@ -98,7 +98,7 @@ export async function numericFormatterTest() {
             codi.assertEqual(formattedValue, expected_formated_value, `We expect the value to equal ${expected_formated_value}, we received ${formattedValue}`)
         });
 
-        await codi.it('Should unformat RUB locale strings', async () => {
+        codi.it('Should unformat RUB locale strings', () => {
             mapp.utils.formatNumericValue(params);
 
             const unformattedString = mapp.utils.unformatStringValue(params)
diff --git a/tests/lib/utils/queryParams.test.mjs b/tests/lib/utils/queryParams.test.mjs
index 46ba5356f8..0094e0a5f3 100644
--- a/tests/lib/utils/queryParams.test.mjs
+++ b/tests/lib/utils/queryParams.test.mjs
@@ -29,7 +29,7 @@ export async function queryParamsTest(mapview) {
             },
         };
 
-        setView(mapview, 2, 'default');
+        await setView(mapview, 2, 'default');
 
         /**
          * ### Should Return undefined
diff --git a/tests/utils/view.js b/tests/utils/view.js
index f8905f7f2a..210d4bd9a2 100644
--- a/tests/utils/view.js
+++ b/tests/utils/view.js
@@ -14,7 +14,7 @@ const views =
     }
 }
 
-export function setView(mapview, z, view) {
-    mapview.Map.getView().setZoom(z);
-    mapview.Map.getView().setCenter([views[view].lat, views[view].long])
+export async function setView(mapview, z, view) {
+    await mapview.Map.getView().setZoom(z);
+    await mapview.Map.getView().setCenter([views[view].lat, views[view].long])
 }
\ No newline at end of file