diff --git a/jest.config.js b/jest.config.js
index 157764e309..3f3ff43e2a 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,5 +1,5 @@
 module.exports = {
     rootDir: '.',
     setupFilesAfterEnv: ['<rootDir>config/jest/enzymeSetup.js'],
-    roots: ['<rootDir>/packages/core/src', '<rootDir>/packages/widgets/src'],
+    roots: ['<rootDir>/packages'],
 }
diff --git a/packages/forms/src/validators/__test__/alphaNumeric.test.js b/packages/forms/src/validators/__tests__/alphaNumeric.test.js
similarity index 89%
rename from packages/forms/src/validators/__test__/alphaNumeric.test.js
rename to packages/forms/src/validators/__tests__/alphaNumeric.test.js
index fac9cafefd..081143eb25 100644
--- a/packages/forms/src/validators/__test__/alphaNumeric.test.js
+++ b/packages/forms/src/validators/__tests__/alphaNumeric.test.js
@@ -1,5 +1,5 @@
 import { alphaNumeric, invalidAlphaNumericMessage } from '../alphaNumeric.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 
 describe('validator: alphaNumeric', () => {
     allowsEmptyValues(alphaNumeric)
diff --git a/packages/forms/src/validators/__test__/boolean.test.js b/packages/forms/src/validators/__tests__/boolean.test.js
similarity index 86%
rename from packages/forms/src/validators/__test__/boolean.test.js
rename to packages/forms/src/validators/__tests__/boolean.test.js
index 3b94ef9004..8663df1179 100644
--- a/packages/forms/src/validators/__test__/boolean.test.js
+++ b/packages/forms/src/validators/__tests__/boolean.test.js
@@ -1,5 +1,5 @@
 import { boolean, invalidBooleanMessage } from '../boolean.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 
 describe('validator: boolean', () => {
     allowsEmptyValues(boolean)
diff --git a/packages/forms/src/validators/__test__/composeValidators.test.js b/packages/forms/src/validators/__tests__/composeValidators.test.js
similarity index 100%
rename from packages/forms/src/validators/__test__/composeValidators.test.js
rename to packages/forms/src/validators/__tests__/composeValidators.test.js
diff --git a/packages/forms/src/validators/__test__/createCharacterLengthRange.test.js b/packages/forms/src/validators/__tests__/createCharacterLengthRange.test.js
similarity index 95%
rename from packages/forms/src/validators/__test__/createCharacterLengthRange.test.js
rename to packages/forms/src/validators/__tests__/createCharacterLengthRange.test.js
index f8e28a53a7..b3de6ceef5 100644
--- a/packages/forms/src/validators/__test__/createCharacterLengthRange.test.js
+++ b/packages/forms/src/validators/__tests__/createCharacterLengthRange.test.js
@@ -1,5 +1,5 @@
 import { createCharacterLengthRange } from '../createCharacterLengthRange.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 import { requiredArgumentErrorMessage } from '../helpers/index.js'
 
 describe('validator: createCharacterLengthRange', () => {
diff --git a/packages/forms/src/validators/__test__/createEqualTo.test.js b/packages/forms/src/validators/__tests__/createEqualTo.test.js
similarity index 96%
rename from packages/forms/src/validators/__test__/createEqualTo.test.js
rename to packages/forms/src/validators/__tests__/createEqualTo.test.js
index 6e4d1252e4..4ff79faf6a 100644
--- a/packages/forms/src/validators/__test__/createEqualTo.test.js
+++ b/packages/forms/src/validators/__tests__/createEqualTo.test.js
@@ -1,5 +1,5 @@
 import { createEqualTo } from '../createEqualTo.js'
-import { allowsEmptyValues } from './helpers/index.js'
+import { allowsEmptyValues } from '../test-helpers'
 import { requiredArgumentErrorMessage } from '../helpers/index.js'
 
 describe('validator: createEqualTo', () => {
diff --git a/packages/forms/src/validators/__test__/createMaxCharacterLength.test.js b/packages/forms/src/validators/__tests__/createMaxCharacterLength.test.js
similarity index 93%
rename from packages/forms/src/validators/__test__/createMaxCharacterLength.test.js
rename to packages/forms/src/validators/__tests__/createMaxCharacterLength.test.js
index 28666fa7a8..5cdc37eaa6 100644
--- a/packages/forms/src/validators/__test__/createMaxCharacterLength.test.js
+++ b/packages/forms/src/validators/__tests__/createMaxCharacterLength.test.js
@@ -1,5 +1,5 @@
 import { createMaxCharacterLength } from '../createMaxCharacterLength.js'
-import { testValidatorValues } from './helpers/index.js'
+import { testValidatorValues } from '../test-helpers'
 
 describe('validator: createMaxCharacterLength', () => {
     const maxSixChars = createMaxCharacterLength(6)
diff --git a/packages/forms/src/validators/__test__/createMaxNumber.test.js b/packages/forms/src/validators/__tests__/createMaxNumber.test.js
similarity index 92%
rename from packages/forms/src/validators/__test__/createMaxNumber.test.js
rename to packages/forms/src/validators/__tests__/createMaxNumber.test.js
index c277139012..e9008a128f 100644
--- a/packages/forms/src/validators/__test__/createMaxNumber.test.js
+++ b/packages/forms/src/validators/__tests__/createMaxNumber.test.js
@@ -1,5 +1,5 @@
 import { createMaxNumber } from '../createMaxNumber.js'
-import { testValidatorValues } from './helpers/index.js'
+import { testValidatorValues } from '../test-helpers'
 
 describe('validator: createMaxNumber', () => {
     const maxSix = createMaxNumber(6)
diff --git a/packages/forms/src/validators/__test__/createMinCharacterLength.test.js b/packages/forms/src/validators/__tests__/createMinCharacterLength.test.js
similarity index 93%
rename from packages/forms/src/validators/__test__/createMinCharacterLength.test.js
rename to packages/forms/src/validators/__tests__/createMinCharacterLength.test.js
index e75398b593..ec503c82fb 100644
--- a/packages/forms/src/validators/__test__/createMinCharacterLength.test.js
+++ b/packages/forms/src/validators/__tests__/createMinCharacterLength.test.js
@@ -1,5 +1,5 @@
 import { createMinCharacterLength } from '../createMinCharacterLength.js'
-import { testValidatorValues } from './helpers/index.js'
+import { testValidatorValues } from '../test-helpers'
 
 describe('validator: createMinCharacterLength', () => {
     const atLeastSixChars = createMinCharacterLength(6)
diff --git a/packages/forms/src/validators/__test__/createMinNumber.test.js b/packages/forms/src/validators/__tests__/createMinNumber.test.js
similarity index 92%
rename from packages/forms/src/validators/__test__/createMinNumber.test.js
rename to packages/forms/src/validators/__tests__/createMinNumber.test.js
index e1565453c4..107b0f6ddd 100644
--- a/packages/forms/src/validators/__test__/createMinNumber.test.js
+++ b/packages/forms/src/validators/__tests__/createMinNumber.test.js
@@ -1,5 +1,5 @@
 import { createMinNumber } from '../createMinNumber.js'
-import { testValidatorValues } from './helpers/index.js'
+import { testValidatorValues } from '../test-helpers'
 
 describe('validator: createMinNumber', () => {
     const atLeastSix = createMinNumber(6)
diff --git a/packages/forms/src/validators/__test__/createNumberRange.test.js b/packages/forms/src/validators/__tests__/createNumberRange.test.js
similarity index 92%
rename from packages/forms/src/validators/__test__/createNumberRange.test.js
rename to packages/forms/src/validators/__tests__/createNumberRange.test.js
index cc08b70864..4201724ff3 100644
--- a/packages/forms/src/validators/__test__/createNumberRange.test.js
+++ b/packages/forms/src/validators/__tests__/createNumberRange.test.js
@@ -1,10 +1,10 @@
 import { createNumberRange } from '../createNumberRange.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 import { requiredArgumentErrorMessage } from '../helpers/index.js'
 
 describe('validator: createNumberRange', () => {
     const betweenSixAndTen = createNumberRange(6, 10)
-    const errorMessage = 'Please enter a number between 6 and 10'
+    const errorMessage = 'Number cannot be less than 6 or more than 10'
 
     it('should throw an error when lower or upper bound are not a number', () => {
         expect(() => {
diff --git a/packages/forms/src/validators/__test__/createPattern.test.js b/packages/forms/src/validators/__tests__/createPattern.test.js
similarity index 96%
rename from packages/forms/src/validators/__test__/createPattern.test.js
rename to packages/forms/src/validators/__tests__/createPattern.test.js
index 3ef66d1e57..ef734db7e8 100644
--- a/packages/forms/src/validators/__test__/createPattern.test.js
+++ b/packages/forms/src/validators/__tests__/createPattern.test.js
@@ -1,5 +1,5 @@
 import { createPattern, invalidPatternMessage } from '../createPattern.js'
-import { allowsEmptyValues } from './helpers/index.js'
+import { allowsEmptyValues } from '../test-helpers'
 
 describe('validator: createPattern', () => {
     const pattern = /^test$/
diff --git a/packages/forms/src/validators/__test__/dhis2Password.test.js b/packages/forms/src/validators/__tests__/dhis2Password.test.js
similarity index 95%
rename from packages/forms/src/validators/__test__/dhis2Password.test.js
rename to packages/forms/src/validators/__tests__/dhis2Password.test.js
index 9e3d64ce70..ac23fa0ff5 100644
--- a/packages/forms/src/validators/__test__/dhis2Password.test.js
+++ b/packages/forms/src/validators/__tests__/dhis2Password.test.js
@@ -1,5 +1,5 @@
 import { dhis2Password, errorMessages } from '../dhis2Password.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 
 describe('validator: dhis2Password', () => {
     allowsEmptyValues(dhis2Password)
diff --git a/packages/forms/src/validators/__test__/dhis2Username.test.js b/packages/forms/src/validators/__tests__/dhis2Username.test.js
similarity index 94%
rename from packages/forms/src/validators/__test__/dhis2Username.test.js
rename to packages/forms/src/validators/__tests__/dhis2Username.test.js
index 8d47b2fbd4..1164ea28b0 100644
--- a/packages/forms/src/validators/__test__/dhis2Username.test.js
+++ b/packages/forms/src/validators/__tests__/dhis2Username.test.js
@@ -1,5 +1,5 @@
 import { dhis2Username, invalidUsernameMessage } from '../dhis2Username.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 
 describe('validator: dhis2Username', () => {
     allowsEmptyValues(dhis2Username)
diff --git a/packages/forms/src/validators/__test__/email.test.js b/packages/forms/src/validators/__tests__/email.test.js
similarity index 97%
rename from packages/forms/src/validators/__test__/email.test.js
rename to packages/forms/src/validators/__tests__/email.test.js
index dbb957dabb..6213f3029a 100644
--- a/packages/forms/src/validators/__test__/email.test.js
+++ b/packages/forms/src/validators/__tests__/email.test.js
@@ -1,5 +1,5 @@
 import { email, invalidEmailMessage } from '../email.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 
 /*
  * A comprehensive list technically valid and invalid email addresses was
diff --git a/packages/forms/src/validators/__test__/hasValue.test.js b/packages/forms/src/validators/__tests__/hasValue.test.js
similarity index 90%
rename from packages/forms/src/validators/__test__/hasValue.test.js
rename to packages/forms/src/validators/__tests__/hasValue.test.js
index d77b54ee4c..566493e3a3 100644
--- a/packages/forms/src/validators/__test__/hasValue.test.js
+++ b/packages/forms/src/validators/__tests__/hasValue.test.js
@@ -1,5 +1,5 @@
 import { hasValue, hasValueMessage } from '../hasValue.js'
-import { testValidatorValues } from './helpers/index.js'
+import { testValidatorValues } from '../test-helpers'
 
 describe('validator: hasValue', () => {
     describe('should return undefined for allowed values', () => {
diff --git a/packages/forms/src/validators/__test__/integer.test.js b/packages/forms/src/validators/__tests__/integer.test.js
similarity index 92%
rename from packages/forms/src/validators/__test__/integer.test.js
rename to packages/forms/src/validators/__tests__/integer.test.js
index c61f5e735c..426a3c846f 100644
--- a/packages/forms/src/validators/__test__/integer.test.js
+++ b/packages/forms/src/validators/__tests__/integer.test.js
@@ -1,5 +1,5 @@
 import { integer, invalidIntegerMessage } from '../integer.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 
 describe('validator: integer', () => {
     allowsEmptyValues(integer)
diff --git a/packages/forms/src/validators/__test__/internationalPhoneNumber.test.js b/packages/forms/src/validators/__tests__/internationalPhoneNumber.test.js
similarity index 94%
rename from packages/forms/src/validators/__test__/internationalPhoneNumber.test.js
rename to packages/forms/src/validators/__tests__/internationalPhoneNumber.test.js
index 8674107e4b..895911977e 100644
--- a/packages/forms/src/validators/__test__/internationalPhoneNumber.test.js
+++ b/packages/forms/src/validators/__tests__/internationalPhoneNumber.test.js
@@ -2,7 +2,7 @@ import {
     internationalPhoneNumber,
     invalidInternationalPhoneNumberMessage,
 } from '../internationalPhoneNumber.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 
 describe('validator: internationalPhoneNumber', () => {
     allowsEmptyValues(internationalPhoneNumber)
diff --git a/packages/forms/src/validators/__test__/number.test.js b/packages/forms/src/validators/__tests__/number.test.js
similarity index 91%
rename from packages/forms/src/validators/__test__/number.test.js
rename to packages/forms/src/validators/__tests__/number.test.js
index 7b89c84868..b62bbc2134 100644
--- a/packages/forms/src/validators/__test__/number.test.js
+++ b/packages/forms/src/validators/__tests__/number.test.js
@@ -1,5 +1,5 @@
 import { number, invalidNumberMessage } from '../number.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 
 describe('validator: number', () => {
     allowsEmptyValues(number)
diff --git a/packages/forms/src/validators/__test__/string.test.js b/packages/forms/src/validators/__tests__/string.test.js
similarity index 87%
rename from packages/forms/src/validators/__test__/string.test.js
rename to packages/forms/src/validators/__tests__/string.test.js
index 696ebe6e42..70bbfb5efd 100644
--- a/packages/forms/src/validators/__test__/string.test.js
+++ b/packages/forms/src/validators/__tests__/string.test.js
@@ -1,5 +1,5 @@
 import { string, invalidStringMessage } from '../string.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 
 describe('validator: string', () => {
     allowsEmptyValues(string)
diff --git a/packages/forms/src/validators/__test__/url.test.js b/packages/forms/src/validators/__tests__/url.test.js
similarity index 97%
rename from packages/forms/src/validators/__test__/url.test.js
rename to packages/forms/src/validators/__tests__/url.test.js
index c6ea619a49..9b4e7c2ace 100644
--- a/packages/forms/src/validators/__test__/url.test.js
+++ b/packages/forms/src/validators/__tests__/url.test.js
@@ -1,5 +1,5 @@
 import { url, invalidUrlMessage } from '../url.js'
-import { testValidatorValues, allowsEmptyValues } from './helpers/index.js'
+import { testValidatorValues, allowsEmptyValues } from '../test-helpers'
 
 /**
  * List of valid and invalid URIs was sourced from
diff --git a/packages/forms/src/validators/__test__/helpers/index.js b/packages/forms/src/validators/test-helpers/index.js
similarity index 100%
rename from packages/forms/src/validators/__test__/helpers/index.js
rename to packages/forms/src/validators/test-helpers/index.js
diff --git a/packages/widgets/src/NoticeBox/__test__/NoticeBoxIcon.test.js b/packages/widgets/src/NoticeBox/__tests__/NoticeBoxIcon.test.js
similarity index 100%
rename from packages/widgets/src/NoticeBox/__test__/NoticeBoxIcon.test.js
rename to packages/widgets/src/NoticeBox/__tests__/NoticeBoxIcon.test.js
diff --git a/packages/widgets/src/NoticeBox/__test__/NoticeBoxMessage.test.js b/packages/widgets/src/NoticeBox/__tests__/NoticeBoxMessage.test.js
similarity index 100%
rename from packages/widgets/src/NoticeBox/__test__/NoticeBoxMessage.test.js
rename to packages/widgets/src/NoticeBox/__tests__/NoticeBoxMessage.test.js
diff --git a/packages/widgets/src/NoticeBox/__test__/NoticeBoxTitle.test.js b/packages/widgets/src/NoticeBox/__tests__/NoticeBoxTitle.test.js
similarity index 100%
rename from packages/widgets/src/NoticeBox/__test__/NoticeBoxTitle.test.js
rename to packages/widgets/src/NoticeBox/__tests__/NoticeBoxTitle.test.js
diff --git a/packages/widgets/src/NoticeBox/__test__/__snapshots__/NoticeBoxIcon.test.js.snap b/packages/widgets/src/NoticeBox/__tests__/__snapshots__/NoticeBoxIcon.test.js.snap
similarity index 100%
rename from packages/widgets/src/NoticeBox/__test__/__snapshots__/NoticeBoxIcon.test.js.snap
rename to packages/widgets/src/NoticeBox/__tests__/__snapshots__/NoticeBoxIcon.test.js.snap