diff --git a/libraries/metrics/test/setup.js b/libraries/metrics/test/setup.js
new file mode 100644
index 0000000000..157dcbe3bc
--- /dev/null
+++ b/libraries/metrics/test/setup.js
@@ -0,0 +1 @@
+// no setup yet
diff --git a/libraries/mongo-utils/test/setup.js b/libraries/mongo-utils/test/setup.js
deleted file mode 100644
index 78e563f853..0000000000
--- a/libraries/mongo-utils/test/setup.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const chai = require('chai')
-const sinonChai = require('sinon-chai')
-const SandboxedModule = require('sandboxed-module')
-
-// Chai configuration
-chai.should()
-chai.use(sinonChai)
-
-SandboxedModule.configure({
-  globals: { Buffer, JSON, console, process },
-})
diff --git a/libraries/o-error/test/setup.js b/libraries/o-error/test/setup.js
new file mode 100644
index 0000000000..157dcbe3bc
--- /dev/null
+++ b/libraries/o-error/test/setup.js
@@ -0,0 +1 @@
+// no setup yet
diff --git a/libraries/o-error/test/o-error-util.test.js b/libraries/o-error/test/unit/o-error-util.test.js
similarity index 99%
rename from libraries/o-error/test/o-error-util.test.js
rename to libraries/o-error/test/unit/o-error-util.test.js
index b29dd4900a..6a8f4090ae 100644
--- a/libraries/o-error/test/o-error-util.test.js
+++ b/libraries/o-error/test/unit/o-error-util.test.js
@@ -1,7 +1,7 @@
 const { expect } = require('chai')
 const { promisify } = require('node:util')
 
-const OError = require('..')
+const OError = require('../..')
 
 const {
   expectError,
diff --git a/libraries/o-error/test/o-error.test.js b/libraries/o-error/test/unit/o-error.test.js
similarity index 98%
rename from libraries/o-error/test/o-error.test.js
rename to libraries/o-error/test/unit/o-error.test.js
index db87f56992..be656d765e 100644
--- a/libraries/o-error/test/o-error.test.js
+++ b/libraries/o-error/test/unit/o-error.test.js
@@ -1,6 +1,6 @@
 const { expect } = require('chai')
 
-const OError = require('..')
+const OError = require('../..')
 const {
   expectError,
   expectFullStackWithoutStackFramesToEqual,
diff --git a/libraries/o-error/test/support/index.js b/libraries/o-error/test/unit/support/index.js
similarity index 97%
rename from libraries/o-error/test/support/index.js
rename to libraries/o-error/test/unit/support/index.js
index 00d9dbb392..05462b14a7 100644
--- a/libraries/o-error/test/support/index.js
+++ b/libraries/o-error/test/unit/support/index.js
@@ -1,6 +1,6 @@
 const { expect } = require('chai')
 
-const OError = require('../..')
+const OError = require('../../..')
 
 /**
  * @param {Error} e
diff --git a/libraries/object-persistor/.mocharc.json b/libraries/object-persistor/.mocharc.json
index c212143ca3..9fe3c1982f 100644
--- a/libraries/object-persistor/.mocharc.json
+++ b/libraries/object-persistor/.mocharc.json
@@ -2,5 +2,5 @@
   "ui": "bdd",
   "recursive": "true",
   "reporter": "spec",
-  "require": "./test/Init"
+  "require": "./test/setup"
 }
diff --git a/libraries/object-persistor/test/Init.js b/libraries/object-persistor/test/setup.js
similarity index 100%
rename from libraries/object-persistor/test/Init.js
rename to libraries/object-persistor/test/setup.js
diff --git a/libraries/overleaf-editor-core/test/setup.js b/libraries/overleaf-editor-core/test/setup.js
new file mode 100644
index 0000000000..157dcbe3bc
--- /dev/null
+++ b/libraries/overleaf-editor-core/test/setup.js
@@ -0,0 +1 @@
+// no setup yet
diff --git a/libraries/overleaf-editor-core/test/add_comment_operation.test.js b/libraries/overleaf-editor-core/test/unit/add_comment_operation.test.js
similarity index 96%
rename from libraries/overleaf-editor-core/test/add_comment_operation.test.js
rename to libraries/overleaf-editor-core/test/unit/add_comment_operation.test.js
index 72d43d6c5a..fe9b9f193d 100644
--- a/libraries/overleaf-editor-core/test/add_comment_operation.test.js
+++ b/libraries/overleaf-editor-core/test/unit/add_comment_operation.test.js
@@ -1,8 +1,8 @@
 // @ts-check
 const { expect } = require('chai')
-const { AddCommentOperation, DeleteCommentOperation } = require('..')
-const Range = require('../lib/range')
-const StringFileData = require('../lib/file_data/string_file_data')
+const { AddCommentOperation, DeleteCommentOperation } = require('../..')
+const Range = require('../../lib/range')
+const StringFileData = require('../../lib/file_data/string_file_data')
 
 describe('AddCommentOperation', function () {
   it('constructs an AddCommentOperation fromJSON', function () {
diff --git a/libraries/overleaf-editor-core/test/change.test.js b/libraries/overleaf-editor-core/test/unit/change.test.js
similarity index 99%
rename from libraries/overleaf-editor-core/test/change.test.js
rename to libraries/overleaf-editor-core/test/unit/change.test.js
index 47eeb7d45a..7adcd17309 100644
--- a/libraries/overleaf-editor-core/test/change.test.js
+++ b/libraries/overleaf-editor-core/test/unit/change.test.js
@@ -9,7 +9,7 @@ const {
   Snapshot,
   Origin,
   RestoreFileOrigin,
-} = require('..')
+} = require('../..')
 
 describe('Change', function () {
   describe('findBlobHashes', function () {
diff --git a/libraries/overleaf-editor-core/test/comment.test.js b/libraries/overleaf-editor-core/test/unit/comment.test.js
similarity index 97%
rename from libraries/overleaf-editor-core/test/comment.test.js
rename to libraries/overleaf-editor-core/test/unit/comment.test.js
index f235c9efd6..cbd237ba27 100644
--- a/libraries/overleaf-editor-core/test/comment.test.js
+++ b/libraries/overleaf-editor-core/test/unit/comment.test.js
@@ -2,8 +2,8 @@
 'use strict'
 
 const { expect } = require('chai')
-const Comment = require('../lib/comment')
-const Range = require('../lib/range')
+const Comment = require('../../lib/comment')
+const Range = require('../../lib/range')
 
 describe('Comment', function () {
   it('should move ranges to the right of insert', function () {
diff --git a/libraries/overleaf-editor-core/test/comments_list.test.js b/libraries/overleaf-editor-core/test/unit/comments_list.test.js
similarity index 98%
rename from libraries/overleaf-editor-core/test/comments_list.test.js
rename to libraries/overleaf-editor-core/test/unit/comments_list.test.js
index d687863c90..63d3b40825 100644
--- a/libraries/overleaf-editor-core/test/comments_list.test.js
+++ b/libraries/overleaf-editor-core/test/unit/comments_list.test.js
@@ -2,9 +2,9 @@
 'use strict'
 
 const { expect } = require('chai')
-const CommentList = require('../lib/file_data/comment_list')
-const Comment = require('../lib/comment')
-const Range = require('../lib/range')
+const CommentList = require('../../lib/file_data/comment_list')
+const Comment = require('../../lib/comment')
+const Range = require('../../lib/range')
 
 describe('commentList', function () {
   it('checks if toRaw() returns a correct comment list', function () {
diff --git a/libraries/overleaf-editor-core/test/delete_comment_operation.test.js b/libraries/overleaf-editor-core/test/unit/delete_comment_operation.test.js
similarity index 90%
rename from libraries/overleaf-editor-core/test/delete_comment_operation.test.js
rename to libraries/overleaf-editor-core/test/unit/delete_comment_operation.test.js
index c6d22604c0..3393e88751 100644
--- a/libraries/overleaf-editor-core/test/delete_comment_operation.test.js
+++ b/libraries/overleaf-editor-core/test/unit/delete_comment_operation.test.js
@@ -1,9 +1,9 @@
 // @ts-check
 const { expect } = require('chai')
-const { AddCommentOperation, DeleteCommentOperation } = require('..')
-const Comment = require('../lib/comment')
-const StringFileData = require('../lib/file_data/string_file_data')
-const Range = require('../lib/range')
+const { AddCommentOperation, DeleteCommentOperation } = require('../..')
+const Comment = require('../../lib/comment')
+const StringFileData = require('../../lib/file_data/string_file_data')
+const Range = require('../../lib/range')
 
 describe('DeleteCommentOperation', function () {
   it('constructs an DeleteCommentOperation fromJSON', function () {
diff --git a/libraries/overleaf-editor-core/test/doc_updater_compatible_ranges.test.js b/libraries/overleaf-editor-core/test/unit/doc_updater_compatible_ranges.test.js
similarity index 98%
rename from libraries/overleaf-editor-core/test/doc_updater_compatible_ranges.test.js
rename to libraries/overleaf-editor-core/test/unit/doc_updater_compatible_ranges.test.js
index 03e6b8b048..4b4feb04fd 100644
--- a/libraries/overleaf-editor-core/test/doc_updater_compatible_ranges.test.js
+++ b/libraries/overleaf-editor-core/test/unit/doc_updater_compatible_ranges.test.js
@@ -3,9 +3,9 @@
 const { expect } = require('chai')
 const {
   getDocUpdaterCompatibleRanges,
-} = require('../lib/doc_updater_compatible_ranges.js')
-const StringFileData = require('../lib/file_data/string_file_data.js')
-const File = require('../lib/file.js')
+} = require('../../lib/doc_updater_compatible_ranges.js')
+const StringFileData = require('../../lib/file_data/string_file_data.js')
+const File = require('../../lib/file.js')
 
 describe('getDocUpdaterCompatibleRanges', function () {
   describe('with tracked deletes', function () {
diff --git a/libraries/overleaf-editor-core/test/edit_file_operation.test.js b/libraries/overleaf-editor-core/test/unit/edit_file_operation.test.js
similarity index 95%
rename from libraries/overleaf-editor-core/test/edit_file_operation.test.js
rename to libraries/overleaf-editor-core/test/unit/edit_file_operation.test.js
index c51e38063c..1ed1ab4a71 100644
--- a/libraries/overleaf-editor-core/test/edit_file_operation.test.js
+++ b/libraries/overleaf-editor-core/test/unit/edit_file_operation.test.js
@@ -3,8 +3,8 @@
 
 const { expect } = require('chai')
 
-const ot = require('..')
-const EditOperationBuilder = require('../lib/operation/edit_operation_builder')
+const ot = require('../..')
+const EditOperationBuilder = require('../../lib/operation/edit_operation_builder')
 const File = ot.File
 const Operation = ot.Operation
 
diff --git a/libraries/overleaf-editor-core/test/edit_operation.test.js b/libraries/overleaf-editor-core/test/unit/edit_operation.test.js
similarity index 94%
rename from libraries/overleaf-editor-core/test/edit_operation.test.js
rename to libraries/overleaf-editor-core/test/unit/edit_operation.test.js
index 56570f0863..d24ab0b693 100644
--- a/libraries/overleaf-editor-core/test/edit_operation.test.js
+++ b/libraries/overleaf-editor-core/test/unit/edit_operation.test.js
@@ -1,15 +1,15 @@
 const { expect } = require('chai')
-const EditOperationBuilder = require('../lib/operation/edit_operation_builder')
-const TextOperation = require('../lib/operation/text_operation')
-const EditOperationTransformer = require('../lib/operation/edit_operation_transformer')
-const EditOperation = require('../lib/operation/edit_operation')
+const EditOperationBuilder = require('../../lib/operation/edit_operation_builder')
+const TextOperation = require('../../lib/operation/text_operation')
+const EditOperationTransformer = require('../../lib/operation/edit_operation_transformer')
+const EditOperation = require('../../lib/operation/edit_operation')
 const randomTextOperation = require('./support/random_text_operation')
 const random = require('./support/random')
-const AddCommentOperation = require('../lib/operation/add_comment_operation')
-const DeleteCommentOperation = require('../lib/operation/delete_comment_operation')
-const SetCommentStateOperation = require('../lib/operation/set_comment_state_operation')
-const Range = require('../lib/range')
-const EditNoOperation = require('../lib/operation/edit_no_operation')
+const AddCommentOperation = require('../../lib/operation/add_comment_operation')
+const DeleteCommentOperation = require('../../lib/operation/delete_comment_operation')
+const SetCommentStateOperation = require('../../lib/operation/set_comment_state_operation')
+const Range = require('../../lib/range')
+const EditNoOperation = require('../../lib/operation/edit_no_operation')
 
 describe('EditOperation', function () {
   it('Cannot be instantiated', function () {
diff --git a/libraries/overleaf-editor-core/test/file.test.js b/libraries/overleaf-editor-core/test/unit/file.test.js
similarity index 99%
rename from libraries/overleaf-editor-core/test/file.test.js
rename to libraries/overleaf-editor-core/test/unit/file.test.js
index 6c96d97b50..4c058f584e 100644
--- a/libraries/overleaf-editor-core/test/file.test.js
+++ b/libraries/overleaf-editor-core/test/unit/file.test.js
@@ -2,7 +2,7 @@
 
 const { expect } = require('chai')
 const FakeBlobStore = require('./support/fake_blob_store')
-const ot = require('..')
+const ot = require('../..')
 const File = ot.File
 
 describe('File', function () {
diff --git a/libraries/overleaf-editor-core/test/file_map.test.js b/libraries/overleaf-editor-core/test/unit/file_map.test.js
similarity index 99%
rename from libraries/overleaf-editor-core/test/file_map.test.js
rename to libraries/overleaf-editor-core/test/unit/file_map.test.js
index 7dc1b706b6..f0766a1757 100644
--- a/libraries/overleaf-editor-core/test/file_map.test.js
+++ b/libraries/overleaf-editor-core/test/unit/file_map.test.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai')
 const _ = require('lodash')
 
-const ot = require('..')
+const ot = require('../..')
 const File = ot.File
 const FileMap = ot.FileMap
 
diff --git a/libraries/overleaf-editor-core/test/hash_file_data.test.js b/libraries/overleaf-editor-core/test/unit/hash_file_data.test.js
similarity index 96%
rename from libraries/overleaf-editor-core/test/hash_file_data.test.js
rename to libraries/overleaf-editor-core/test/unit/hash_file_data.test.js
index cf7ff56738..781f929f61 100644
--- a/libraries/overleaf-editor-core/test/hash_file_data.test.js
+++ b/libraries/overleaf-editor-core/test/unit/hash_file_data.test.js
@@ -1,8 +1,8 @@
-const HashFileData = require('../lib/file_data/hash_file_data')
+const HashFileData = require('../../lib/file_data/hash_file_data')
 const { expect } = require('chai')
-const StringFileData = require('../lib/file_data/string_file_data')
+const StringFileData = require('../../lib/file_data/string_file_data')
 const sinon = require('sinon')
-const Blob = require('../lib/blob')
+const Blob = require('../../lib/blob')
 
 describe('HashFileData', function () {
   beforeEach(function () {
diff --git a/libraries/overleaf-editor-core/test/history.test.js b/libraries/overleaf-editor-core/test/unit/history.test.js
similarity index 97%
rename from libraries/overleaf-editor-core/test/history.test.js
rename to libraries/overleaf-editor-core/test/unit/history.test.js
index c5be9d8d60..abaccd98c6 100644
--- a/libraries/overleaf-editor-core/test/history.test.js
+++ b/libraries/overleaf-editor-core/test/unit/history.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const core = require('..')
+const core = require('../..')
 const Change = core.Change
 const File = core.File
 const History = core.History
diff --git a/libraries/overleaf-editor-core/test/hollow_string_file_data.test.js b/libraries/overleaf-editor-core/test/unit/hollow_string_file_data.test.js
similarity index 86%
rename from libraries/overleaf-editor-core/test/hollow_string_file_data.test.js
rename to libraries/overleaf-editor-core/test/unit/hollow_string_file_data.test.js
index e40fec228f..4e195a3372 100644
--- a/libraries/overleaf-editor-core/test/hollow_string_file_data.test.js
+++ b/libraries/overleaf-editor-core/test/unit/hollow_string_file_data.test.js
@@ -1,8 +1,8 @@
 'use strict'
 
 const { expect } = require('chai')
-const ot = require('..')
-const HollowStringFileData = require('../lib/file_data/hollow_string_file_data')
+const ot = require('../..')
+const HollowStringFileData = require('../../lib/file_data/hollow_string_file_data')
 const TextOperation = ot.TextOperation
 
 describe('HollowStringFileData', function () {
diff --git a/libraries/overleaf-editor-core/test/label.test.js b/libraries/overleaf-editor-core/test/unit/label.test.js
similarity index 92%
rename from libraries/overleaf-editor-core/test/label.test.js
rename to libraries/overleaf-editor-core/test/unit/label.test.js
index 448b6f0052..ab0861a6f0 100644
--- a/libraries/overleaf-editor-core/test/label.test.js
+++ b/libraries/overleaf-editor-core/test/unit/label.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const ot = require('..')
+const ot = require('../..')
 const Label = ot.Label
 
 describe('Label', function () {
diff --git a/libraries/overleaf-editor-core/test/lazy_string_file_data.test.js b/libraries/overleaf-editor-core/test/unit/lazy_string_file_data.test.js
similarity index 97%
rename from libraries/overleaf-editor-core/test/lazy_string_file_data.test.js
rename to libraries/overleaf-editor-core/test/unit/lazy_string_file_data.test.js
index 946e6cd5d1..7da0fa0ceb 100644
--- a/libraries/overleaf-editor-core/test/lazy_string_file_data.test.js
+++ b/libraries/overleaf-editor-core/test/unit/lazy_string_file_data.test.js
@@ -5,11 +5,11 @@ const _ = require('lodash')
 const { expect } = require('chai')
 const sinon = require('sinon')
 
-const ot = require('..')
+const ot = require('../..')
 const File = ot.File
 const TextOperation = ot.TextOperation
-const LazyStringFileData = require('../lib/file_data/lazy_string_file_data')
-const EagerStringFileData = require('../lib/file_data/string_file_data')
+const LazyStringFileData = require('../../lib/file_data/lazy_string_file_data')
+const EagerStringFileData = require('../../lib/file_data/string_file_data')
 
 describe('LazyStringFileData', function () {
   beforeEach(function () {
diff --git a/libraries/overleaf-editor-core/test/move_file_operation.test.js b/libraries/overleaf-editor-core/test/unit/move_file_operation.test.js
similarity index 98%
rename from libraries/overleaf-editor-core/test/move_file_operation.test.js
rename to libraries/overleaf-editor-core/test/unit/move_file_operation.test.js
index d8bf923762..8fe865b7eb 100644
--- a/libraries/overleaf-editor-core/test/move_file_operation.test.js
+++ b/libraries/overleaf-editor-core/test/unit/move_file_operation.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const ot = require('..')
+const ot = require('../..')
 const File = ot.File
 const MoveFileOperation = ot.MoveFileOperation
 const Snapshot = ot.Snapshot
diff --git a/libraries/overleaf-editor-core/test/operation.test.js b/libraries/overleaf-editor-core/test/unit/operation.test.js
similarity index 99%
rename from libraries/overleaf-editor-core/test/operation.test.js
rename to libraries/overleaf-editor-core/test/unit/operation.test.js
index c2edc66f6e..54df6fcc03 100644
--- a/libraries/overleaf-editor-core/test/operation.test.js
+++ b/libraries/overleaf-editor-core/test/unit/operation.test.js
@@ -3,8 +3,8 @@
 const _ = require('lodash')
 const { expect } = require('chai')
 
-const ot = require('..')
-const StringFileData = require('../lib/file_data/string_file_data')
+const ot = require('../..')
+const StringFileData = require('../../lib/file_data/string_file_data')
 const File = ot.File
 const AddFileOperation = ot.AddFileOperation
 const MoveFileOperation = ot.MoveFileOperation
diff --git a/libraries/overleaf-editor-core/test/range.test.js b/libraries/overleaf-editor-core/test/unit/range.test.js
similarity index 99%
rename from libraries/overleaf-editor-core/test/range.test.js
rename to libraries/overleaf-editor-core/test/unit/range.test.js
index 9a048d5c03..3976a8939e 100644
--- a/libraries/overleaf-editor-core/test/range.test.js
+++ b/libraries/overleaf-editor-core/test/unit/range.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const Range = require('../lib/range')
+const Range = require('../../lib/range')
 
 describe('Range', function () {
   it('should create a range', function () {
diff --git a/libraries/overleaf-editor-core/test/safe_pathname.test.js b/libraries/overleaf-editor-core/test/unit/safe_pathname.test.js
similarity index 99%
rename from libraries/overleaf-editor-core/test/safe_pathname.test.js
rename to libraries/overleaf-editor-core/test/unit/safe_pathname.test.js
index bfde298f58..dee721bb1a 100644
--- a/libraries/overleaf-editor-core/test/safe_pathname.test.js
+++ b/libraries/overleaf-editor-core/test/unit/safe_pathname.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const ot = require('..')
+const ot = require('../..')
 const safePathname = ot.safePathname
 
 describe('safePathname', function () {
diff --git a/libraries/overleaf-editor-core/test/scan_op.test.js b/libraries/overleaf-editor-core/test/unit/scan_op.test.js
similarity index 98%
rename from libraries/overleaf-editor-core/test/scan_op.test.js
rename to libraries/overleaf-editor-core/test/unit/scan_op.test.js
index 98f4834d48..22b2a33a65 100644
--- a/libraries/overleaf-editor-core/test/scan_op.test.js
+++ b/libraries/overleaf-editor-core/test/unit/scan_op.test.js
@@ -5,9 +5,9 @@ const {
   ScanOp,
   InsertOp,
   RemoveOp,
-} = require('../lib/operation/scan_op')
-const { UnprocessableError, ApplyError } = require('../lib/errors')
-const TrackingProps = require('../lib/file_data/tracking_props')
+} = require('../../lib/operation/scan_op')
+const { UnprocessableError, ApplyError } = require('../../lib/errors')
+const TrackingProps = require('../../lib/file_data/tracking_props')
 
 describe('ScanOp', function () {
   describe('fromJSON', function () {
diff --git a/libraries/overleaf-editor-core/test/snapshot.test.js b/libraries/overleaf-editor-core/test/unit/snapshot.test.js
similarity index 99%
rename from libraries/overleaf-editor-core/test/snapshot.test.js
rename to libraries/overleaf-editor-core/test/unit/snapshot.test.js
index f7979952e6..b9170736f8 100644
--- a/libraries/overleaf-editor-core/test/snapshot.test.js
+++ b/libraries/overleaf-editor-core/test/unit/snapshot.test.js
@@ -7,7 +7,7 @@ const {
   TextOperation,
   Change,
   EditFileOperation,
-} = require('..')
+} = require('../..')
 
 describe('Snapshot', function () {
   describe('findBlobHashes', function () {
diff --git a/libraries/overleaf-editor-core/test/string_file_data.test.js b/libraries/overleaf-editor-core/test/unit/string_file_data.test.js
similarity index 97%
rename from libraries/overleaf-editor-core/test/string_file_data.test.js
rename to libraries/overleaf-editor-core/test/unit/string_file_data.test.js
index 45a0337da1..f612c1511e 100644
--- a/libraries/overleaf-editor-core/test/string_file_data.test.js
+++ b/libraries/overleaf-editor-core/test/unit/string_file_data.test.js
@@ -4,8 +4,8 @@
 const { expect } = require('chai')
 const _ = require('lodash')
 
-const ot = require('..')
-const StringFileData = require('../lib/file_data/string_file_data')
+const ot = require('../..')
+const StringFileData = require('../../lib/file_data/string_file_data')
 const TextOperation = ot.TextOperation
 
 describe('StringFileData', function () {
diff --git a/libraries/overleaf-editor-core/test/support/fake_blob_store.js b/libraries/overleaf-editor-core/test/unit/support/fake_blob_store.js
similarity index 100%
rename from libraries/overleaf-editor-core/test/support/fake_blob_store.js
rename to libraries/overleaf-editor-core/test/unit/support/fake_blob_store.js
diff --git a/libraries/overleaf-editor-core/test/support/random.js b/libraries/overleaf-editor-core/test/unit/support/random.js
similarity index 100%
rename from libraries/overleaf-editor-core/test/support/random.js
rename to libraries/overleaf-editor-core/test/unit/support/random.js
diff --git a/libraries/overleaf-editor-core/test/support/random_text_operation.js b/libraries/overleaf-editor-core/test/unit/support/random_text_operation.js
similarity index 86%
rename from libraries/overleaf-editor-core/test/support/random_text_operation.js
rename to libraries/overleaf-editor-core/test/unit/support/random_text_operation.js
index a600cdc852..d2ab4be73e 100644
--- a/libraries/overleaf-editor-core/test/support/random_text_operation.js
+++ b/libraries/overleaf-editor-core/test/unit/support/random_text_operation.js
@@ -1,6 +1,6 @@
-const TrackingProps = require('../../lib/file_data/tracking_props')
-const ClearTrackingProps = require('../../lib/file_data/clear_tracking_props')
-const TextOperation = require('../../lib/operation/text_operation')
+const TrackingProps = require('../../../lib/file_data/tracking_props')
+const ClearTrackingProps = require('../../../lib/file_data/clear_tracking_props')
+const TextOperation = require('../../../lib/operation/text_operation')
 const random = require('./random')
 
 /**
diff --git a/libraries/overleaf-editor-core/test/text_operation.test.js b/libraries/overleaf-editor-core/test/unit/text_operation.test.js
similarity index 98%
rename from libraries/overleaf-editor-core/test/text_operation.test.js
rename to libraries/overleaf-editor-core/test/unit/text_operation.test.js
index 43b8c707a6..041cad55d7 100644
--- a/libraries/overleaf-editor-core/test/text_operation.test.js
+++ b/libraries/overleaf-editor-core/test/unit/text_operation.test.js
@@ -10,12 +10,12 @@ const { expect } = require('chai')
 const random = require('./support/random')
 const randomOperation = require('./support/random_text_operation')
 
-const ot = require('..')
+const ot = require('../..')
 const TextOperation = ot.TextOperation
-const StringFileData = require('../lib/file_data/string_file_data')
-const { RetainOp, InsertOp, RemoveOp } = require('../lib/operation/scan_op')
-const TrackingProps = require('../lib/file_data/tracking_props')
-const ClearTrackingProps = require('../lib/file_data/clear_tracking_props')
+const StringFileData = require('../../lib/file_data/string_file_data')
+const { RetainOp, InsertOp, RemoveOp } = require('../../lib/operation/scan_op')
+const TrackingProps = require('../../lib/file_data/tracking_props')
+const ClearTrackingProps = require('../../lib/file_data/clear_tracking_props')
 
 describe('TextOperation', function () {
   const numTrials = 500
diff --git a/libraries/overleaf-editor-core/test/tracked_change.test.js b/libraries/overleaf-editor-core/test/unit/tracked_change.test.js
similarity index 89%
rename from libraries/overleaf-editor-core/test/tracked_change.test.js
rename to libraries/overleaf-editor-core/test/unit/tracked_change.test.js
index 8837812a3f..4ff5bbccc0 100644
--- a/libraries/overleaf-editor-core/test/tracked_change.test.js
+++ b/libraries/overleaf-editor-core/test/unit/tracked_change.test.js
@@ -1,7 +1,7 @@
 // @ts-check
-const TrackedChange = require('../lib/file_data/tracked_change')
-const Range = require('../lib/range')
-const TrackingProps = require('../lib/file_data/tracking_props')
+const TrackedChange = require('../../lib/file_data/tracked_change')
+const Range = require('../../lib/range')
+const TrackingProps = require('../../lib/file_data/tracking_props')
 const { expect } = require('chai')
 
 describe('TrackedChange', function () {
diff --git a/libraries/overleaf-editor-core/test/tracked_change_list.test.js b/libraries/overleaf-editor-core/test/unit/tracked_change_list.test.js
similarity index 98%
rename from libraries/overleaf-editor-core/test/tracked_change_list.test.js
rename to libraries/overleaf-editor-core/test/unit/tracked_change_list.test.js
index 6cf47f0b0b..6be56c3b91 100644
--- a/libraries/overleaf-editor-core/test/tracked_change_list.test.js
+++ b/libraries/overleaf-editor-core/test/unit/tracked_change_list.test.js
@@ -1,9 +1,9 @@
 // @ts-check
-const TrackedChangeList = require('../lib/file_data/tracked_change_list')
-const TrackingProps = require('../lib/file_data/tracking_props')
-const ClearTrackingProps = require('../lib/file_data/clear_tracking_props')
+const TrackedChangeList = require('../../lib/file_data/tracked_change_list')
+const TrackingProps = require('../../lib/file_data/tracking_props')
+const ClearTrackingProps = require('../../lib/file_data/clear_tracking_props')
 const { expect } = require('chai')
-/** @import { TrackedChangeRawData } from '../lib/types' */
+/** @import { TrackedChangeRawData } from '../../lib/types' */
 
 describe('TrackedChangeList', function () {
   describe('applyInsert', function () {
diff --git a/libraries/ranges-tracker/test/setup.js b/libraries/ranges-tracker/test/setup.js
new file mode 100644
index 0000000000..157dcbe3bc
--- /dev/null
+++ b/libraries/ranges-tracker/test/setup.js
@@ -0,0 +1 @@
+// no setup yet
diff --git a/libraries/settings/test/notests.js b/libraries/settings/test/notests.js
deleted file mode 100644
index 62307e456d..0000000000
--- a/libraries/settings/test/notests.js
+++ /dev/null
@@ -1 +0,0 @@
-// There are no tests yet
diff --git a/libraries/stream-utils/test/setup.js b/libraries/stream-utils/test/setup.js
new file mode 100644
index 0000000000..157dcbe3bc
--- /dev/null
+++ b/libraries/stream-utils/test/setup.js
@@ -0,0 +1 @@
+// no setup yet
diff --git a/libraries/validation-tools/test/setup.js b/libraries/validation-tools/test/setup.js
new file mode 100644
index 0000000000..157dcbe3bc
--- /dev/null
+++ b/libraries/validation-tools/test/setup.js
@@ -0,0 +1 @@
+// no setup yet