diff --git a/conductors/local_bash_conductor.py b/conductors/local_bash_conductor.py
index 2a622fe..a821fb5 100644
--- a/conductors/local_bash_conductor.py
+++ b/conductors/local_bash_conductor.py
@@ -14,13 +14,13 @@ from datetime import datetime
 from typing import Any, Dict, Tuple
 
 from meow_base.core.base_conductor import BaseConductor
-from meow_base.core.correctness.meow import valid_job
-from meow_base.core.correctness.vars import DEFAULT_JOB_QUEUE_DIR, \
+from meow_base.core.meow import valid_job
+from meow_base.core.vars import DEFAULT_JOB_QUEUE_DIR, \
     DEFAULT_JOB_OUTPUT_DIR, JOB_TYPE, JOB_TYPE_BASH, META_FILE, JOB_STATUS, \
     BACKUP_JOB_ERROR_FILE, STATUS_DONE, JOB_END_TIME, STATUS_FAILED, \
     JOB_ERROR, JOB_TYPE, DEFAULT_JOB_QUEUE_DIR, STATUS_RUNNING, \
     JOB_START_TIME, DEFAULT_JOB_OUTPUT_DIR, get_job_file
-from meow_base.core.correctness.validation import valid_dir_path
+from meow_base.functionality.validation import valid_dir_path
 from meow_base.functionality.file_io import make_dir, read_yaml, write_file, \
     write_yaml
 
diff --git a/conductors/local_python_conductor.py b/conductors/local_python_conductor.py
index 30305c1..22cb8e9 100644
--- a/conductors/local_python_conductor.py
+++ b/conductors/local_python_conductor.py
@@ -12,13 +12,13 @@ from datetime import datetime
 from typing import Any, Tuple, Dict
 
 from meow_base.core.base_conductor import BaseConductor
-from meow_base.core.correctness.meow import valid_job
-from meow_base.core.correctness.vars import JOB_TYPE_PYTHON, PYTHON_FUNC, \
+from meow_base.core.meow import valid_job
+from meow_base.core.vars import JOB_TYPE_PYTHON, PYTHON_FUNC, \
     JOB_STATUS, STATUS_RUNNING, JOB_START_TIME, META_FILE, \
     BACKUP_JOB_ERROR_FILE, STATUS_DONE, JOB_END_TIME, STATUS_FAILED, \
     JOB_ERROR, JOB_TYPE, JOB_TYPE_PAPERMILL, DEFAULT_JOB_QUEUE_DIR, \
     DEFAULT_JOB_OUTPUT_DIR
-from meow_base.core.correctness.validation import valid_dir_path
+from meow_base.functionality.validation import valid_dir_path
 from meow_base.functionality.file_io import make_dir, read_yaml, write_file, \
     write_yaml
 
diff --git a/core/__init__.py b/core/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/core/base_conductor.py b/core/base_conductor.py
index c590775..d6a4006 100644
--- a/core/base_conductor.py
+++ b/core/base_conductor.py
@@ -8,9 +8,9 @@ Author(s): David Marchant
 
 from typing import Any, Tuple, Dict
 
-from meow_base.core.correctness.vars import VALID_CONDUCTOR_NAME_CHARS, \
+from meow_base.core.vars import VALID_CONDUCTOR_NAME_CHARS, \
     get_drt_imp_msg
-from meow_base.core.correctness.validation import check_implementation, \
+from meow_base.functionality.validation import check_implementation, \
     valid_string
 from meow_base.functionality.naming import generate_conductor_id
 
diff --git a/core/base_handler.py b/core/base_handler.py
index f1243d6..2c628bd 100644
--- a/core/base_handler.py
+++ b/core/base_handler.py
@@ -8,9 +8,9 @@ Author(s): David Marchant
 
 from typing import Any, Tuple, Dict
 
-from meow_base.core.correctness.vars import VALID_CHANNELS, \
+from meow_base.core.vars import VALID_CHANNELS, \
     VALID_HANDLER_NAME_CHARS, get_drt_imp_msg
-from meow_base.core.correctness.validation import check_implementation, \
+from meow_base.functionality.validation import check_implementation, \
     valid_string
 from meow_base.functionality.naming import generate_handler_id
 
diff --git a/core/base_monitor.py b/core/base_monitor.py
index 227d676..169e28a 100644
--- a/core/base_monitor.py
+++ b/core/base_monitor.py
@@ -12,9 +12,9 @@ from typing import Union, Dict
 from meow_base.core.base_pattern import BasePattern
 from meow_base.core.base_recipe import BaseRecipe
 from meow_base.core.rule import Rule
-from meow_base.core.correctness.vars import VALID_CHANNELS, \
+from meow_base.core.vars import VALID_CHANNELS, \
     VALID_MONITOR_NAME_CHARS, get_drt_imp_msg 
-from meow_base.core.correctness.validation import check_implementation, \
+from meow_base.functionality.validation import check_implementation, \
     valid_string
 from meow_base.functionality.meow import create_rules
 from meow_base.functionality.naming import generate_monitor_id
diff --git a/core/base_pattern.py b/core/base_pattern.py
index 81fcbc1..e17789f 100644
--- a/core/base_pattern.py
+++ b/core/base_pattern.py
@@ -10,9 +10,9 @@ import itertools
 
 from typing import Any, Union, Tuple, Dict, List
 
-from meow_base.core.correctness.vars import VALID_PATTERN_NAME_CHARS, \
+from meow_base.core.vars import VALID_PATTERN_NAME_CHARS, \
     SWEEP_JUMP, SWEEP_START, SWEEP_STOP, get_drt_imp_msg
-from meow_base.core.correctness.validation import valid_string, check_type, \
+from meow_base.functionality.validation import valid_string, check_type, \
     check_implementation, valid_dict
 
 
diff --git a/core/base_recipe.py b/core/base_recipe.py
index fc07657..fc3c0ce 100644
--- a/core/base_recipe.py
+++ b/core/base_recipe.py
@@ -8,9 +8,9 @@ Author(s): David Marchant
 
 from typing import Any, Dict
 
-from meow_base.core.correctness.vars import VALID_RECIPE_NAME_CHARS, \
+from meow_base.core.vars import VALID_RECIPE_NAME_CHARS, \
     get_drt_imp_msg
-from meow_base.core.correctness.validation import check_implementation, \
+from meow_base.functionality.validation import check_implementation, \
     valid_string
 
 
diff --git a/core/correctness/__init__.py b/core/correctness/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/core/correctness/meow.py b/core/meow.py
similarity index 85%
rename from core/correctness/meow.py
rename to core/meow.py
index a2f6fa4..2cba545 100644
--- a/core/correctness/meow.py
+++ b/core/meow.py
@@ -1,10 +1,16 @@
 
+"""
+This file contains certain meow specific defintions, most notably the 
+dictionaries passed around within the runner.
+
+Author(s): David Marchant
+"""
 from datetime import datetime
 from typing import Any, Dict, Type
 
 from meow_base.core.rule import Rule
-from meow_base.core.correctness.validation import check_type
-from meow_base.core.correctness.vars import EVENT_TYPE, EVENT_PATH, \
+from meow_base.functionality.validation import check_type
+from meow_base.core.vars import EVENT_TYPE, EVENT_PATH, \
     JOB_EVENT, JOB_TYPE, JOB_ID, JOB_PATTERN, JOB_RECIPE, JOB_RULE, \
     JOB_STATUS, JOB_CREATE_TIME, EVENT_RULE, WATCHDOG_BASE, WATCHDOG_HASH
 
@@ -12,7 +18,6 @@ from meow_base.core.correctness.vars import EVENT_TYPE, EVENT_PATH, \
 EVENT_KEYS = {
     EVENT_TYPE: str,
     EVENT_PATH: str,
-    # Should be a Rule but can't import here due to circular dependencies
     EVENT_RULE: Rule
 }
 
diff --git a/core/rule.py b/core/rule.py
index 22fc99a..3a3d798 100644
--- a/core/rule.py
+++ b/core/rule.py
@@ -12,9 +12,9 @@ if "BasePattern" not in modules:
     from meow_base.core.base_pattern import BasePattern
 if "BaseRecipe" not in modules:
     from meow_base.core.base_recipe import BaseRecipe
-from meow_base.core.correctness.vars import VALID_RULE_NAME_CHARS, \
+from meow_base.core.vars import VALID_RULE_NAME_CHARS, \
     get_drt_imp_msg
-from meow_base.core.correctness.validation import valid_string, check_type, \
+from meow_base.functionality.validation import valid_string, check_type, \
     check_implementation
 from meow_base.functionality.naming import generate_rule_id
 
diff --git a/core/runner.py b/core/runner.py
index 10363a6..0e68d59 100644
--- a/core/runner.py
+++ b/core/runner.py
@@ -17,10 +17,10 @@ from typing import Any, Union, Dict, List, Type
 from meow_base.core.base_conductor import BaseConductor
 from meow_base.core.base_handler import BaseHandler
 from meow_base.core.base_monitor import BaseMonitor
-from meow_base.core.correctness.vars import DEBUG_WARNING, DEBUG_INFO, \
+from meow_base.core.vars import DEBUG_WARNING, DEBUG_INFO, \
     EVENT_TYPE, VALID_CHANNELS, META_FILE, DEFAULT_JOB_OUTPUT_DIR, \
     DEFAULT_JOB_QUEUE_DIR, EVENT_PATH
-from meow_base.core.correctness.validation import check_type, valid_list, \
+from meow_base.functionality.validation import check_type, valid_list, \
     valid_dir_path
 from meow_base.functionality.debug import setup_debugging, print_debug
 from meow_base.functionality.file_io import make_dir, read_yaml
diff --git a/core/correctness/vars.py b/core/vars.py
similarity index 100%
rename from core/correctness/vars.py
rename to core/vars.py
diff --git a/functionality/debug.py b/functionality/debug.py
index 56f4826..36687f8 100644
--- a/functionality/debug.py
+++ b/functionality/debug.py
@@ -6,8 +6,8 @@ Author(s): David Marchant
 
 from typing import Any, Tuple
 
-from meow_base.core.correctness.validation import check_type
-from meow_base.core.correctness.vars import DEBUG_INFO, DEBUG_WARNING
+from meow_base.functionality.validation import check_type
+from meow_base.core.vars import DEBUG_INFO, DEBUG_WARNING
 
 
 def setup_debugging(print:Any=None, logging:int=0)->Tuple[Any,int]:
diff --git a/functionality/file_io.py b/functionality/file_io.py
index 5107e31..e8dab4d 100644
--- a/functionality/file_io.py
+++ b/functionality/file_io.py
@@ -11,7 +11,7 @@ from os import makedirs, remove, rmdir, walk
 from os.path import exists, isfile, join
 from typing import Any, Dict, List
 
-from meow_base.core.correctness.validation import valid_path
+from meow_base.functionality.validation import valid_path
 
 
 def make_dir(path:str, can_exist:bool=True, ensure_clean:bool=False):
diff --git a/functionality/hashing.py b/functionality/hashing.py
index 55214f9..d976a49 100644
--- a/functionality/hashing.py
+++ b/functionality/hashing.py
@@ -9,8 +9,8 @@ from os import listdir
 from os.path import isfile
 
 
-from meow_base.core.correctness.vars import HASH_BUFFER_SIZE, SHA256
-from meow_base.core.correctness.validation import check_type, \
+from meow_base.core.vars import HASH_BUFFER_SIZE, SHA256
+from meow_base.functionality.validation import check_type, \
     valid_existing_file_path, valid_existing_dir_path
 
 def _get_file_sha256(file_path:str)->str:
diff --git a/functionality/meow.py b/functionality/meow.py
index 9fadd2c..556aca5 100644
--- a/functionality/meow.py
+++ b/functionality/meow.py
@@ -11,9 +11,9 @@ from typing import Any, Dict, Union, List
 from meow_base.core.base_pattern import BasePattern
 from meow_base.core.base_recipe import BaseRecipe
 from meow_base.core.rule import Rule
-from meow_base.core.correctness.validation import check_type, valid_dict, \
+from meow_base.functionality.validation import check_type, valid_dict, \
     valid_list
-from meow_base.core.correctness.vars import EVENT_PATH, EVENT_RULE, \
+from meow_base.core.vars import EVENT_PATH, EVENT_RULE, \
     EVENT_TYPE, EVENT_TYPE_WATCHDOG, JOB_CREATE_TIME, JOB_EVENT, JOB_ID, \
     JOB_PATTERN, JOB_RECIPE, JOB_REQUIREMENTS, JOB_RULE, JOB_STATUS, \
     JOB_TYPE, STATUS_QUEUED, WATCHDOG_BASE, WATCHDOG_HASH, SWEEP_JUMP, \
diff --git a/functionality/naming.py b/functionality/naming.py
index 09c83c1..5601dba 100644
--- a/functionality/naming.py
+++ b/functionality/naming.py
@@ -7,7 +7,7 @@ Author(s): David Marchant
 from typing import List
 from random import SystemRandom
 
-from meow_base.core.correctness.vars import CHAR_LOWERCASE, CHAR_UPPERCASE
+from meow_base.core.vars import CHAR_LOWERCASE, CHAR_UPPERCASE
 
 
 #TODO Make this guaranteed unique
diff --git a/functionality/parameterisation.py b/functionality/parameterisation.py
index c0640ad..5a906be 100644
--- a/functionality/parameterisation.py
+++ b/functionality/parameterisation.py
@@ -10,7 +10,7 @@ from os import getenv
 from papermill.translators import papermill_translators
 from typing import Any, Dict, List
 
-from meow_base.core.correctness.validation import check_script, check_type
+from meow_base.functionality.validation import check_script, check_type
 
 # Adapted from: https://github.com/rasmunk/notebook_parameterizer
 def parameterize_jupyter_notebook(jupyter_notebook:Dict[str,Any], 
@@ -151,4 +151,4 @@ def parameterize_bash_script(script:List[str], parameters:Dict[str,Any],
     # Validate that the parameterized notebook is still valid
     check_script(output_script)
 
-    return output_script
\ No newline at end of file
+    return output_script
diff --git a/functionality/process_io.py b/functionality/process_io.py
index 9d9c603..62e7a97 100644
--- a/functionality/process_io.py
+++ b/functionality/process_io.py
@@ -12,7 +12,7 @@ from multiprocessing.connection import Connection, wait as multi_wait
 if osName == 'nt':
     from multiprocessing.connection import PipeConnection
 from multiprocessing.queues import Queue
-from meow_base.core.correctness.vars import VALID_CHANNELS
+from meow_base.core.vars import VALID_CHANNELS
 
 
 def wait(inputs:List[VALID_CHANNELS])->List[VALID_CHANNELS]:
diff --git a/functionality/requirements.py b/functionality/requirements.py
index 643d2f7..f68a406 100644
--- a/functionality/requirements.py
+++ b/functionality/requirements.py
@@ -11,7 +11,7 @@ from os.path import basename
 from sys import version_info, prefix, base_prefix
 from typing import Any, Dict, List, Tuple, Union
 
-from meow_base.core.correctness.validation import check_type
+from meow_base.functionality.validation import check_type
 
 REQUIREMENT_PYTHON = "python"
 REQ_PYTHON_MODULES = "modules"
diff --git a/core/correctness/validation.py b/functionality/validation.py
similarity index 99%
rename from core/correctness/validation.py
rename to functionality/validation.py
index f5b8f9f..34f0572 100644
--- a/core/correctness/validation.py
+++ b/functionality/validation.py
@@ -11,7 +11,7 @@ from os.path import sep, exists, isfile, isdir, dirname
 from typing import Any, _SpecialForm, Union, Type, Dict, List, \
     get_origin, get_args
 
-from meow_base.core.correctness.vars import VALID_PATH_CHARS, get_not_imp_msg
+from meow_base.core.vars import VALID_PATH_CHARS, get_not_imp_msg
 
 def check_type(variable:Any, expected_type:Type, alt_types:List[Type]=[], 
         or_none:bool=False, hint:str="")->None:
diff --git a/patterns/file_event_pattern.py b/patterns/file_event_pattern.py
index af403c4..2244980 100644
--- a/patterns/file_event_pattern.py
+++ b/patterns/file_event_pattern.py
@@ -22,9 +22,9 @@ from meow_base.core.base_recipe import BaseRecipe
 from meow_base.core.base_monitor import BaseMonitor
 from meow_base.core.base_pattern import BasePattern
 from meow_base.core.rule import Rule
-from meow_base.core.correctness.validation import check_type, valid_string, \
+from meow_base.functionality.validation import check_type, valid_string, \
     valid_dict, valid_list, valid_dir_path
-from meow_base.core.correctness.vars import VALID_RECIPE_NAME_CHARS, \
+from meow_base.core.vars import VALID_RECIPE_NAME_CHARS, \
     VALID_VARIABLE_NAME_CHARS, FILE_EVENTS, FILE_CREATE_EVENT, \
     FILE_MODIFY_EVENT, FILE_MOVED_EVENT, DEBUG_INFO, DIR_EVENTS, \
     FILE_RETROACTIVE_EVENT, SHA256, VALID_PATH_CHARS, FILE_CLOSED_EVENT, \
diff --git a/recipes/bash_recipe.py b/recipes/bash_recipe.py
index 53c5591..1e5f940 100644
--- a/recipes/bash_recipe.py
+++ b/recipes/bash_recipe.py
@@ -7,10 +7,10 @@ from typing import Any, Dict, List, Tuple
 
 from meow_base.core.base_handler import BaseHandler
 from meow_base.core.base_recipe import BaseRecipe
-from meow_base.core.correctness.meow import valid_event
-from meow_base.core.correctness.validation import check_type, valid_dict, \
+from meow_base.core.meow import valid_event
+from meow_base.functionality.validation import check_type, valid_dict, \
     valid_string, valid_dir_path
-from meow_base.core.correctness.vars import DEBUG_INFO, DEFAULT_JOB_QUEUE_DIR, \
+from meow_base.core.vars import DEBUG_INFO, DEFAULT_JOB_QUEUE_DIR, \
     VALID_VARIABLE_NAME_CHARS, EVENT_PATH, EVENT_RULE, EVENT_TYPE, JOB_ID, \
     EVENT_TYPE_WATCHDOG, JOB_TYPE_BASH, JOB_PARAMETERS, WATCHDOG_HASH, \
     WATCHDOG_BASE, META_FILE, STATUS_QUEUED, JOB_STATUS, \
diff --git a/recipes/jupyter_notebook_recipe.py b/recipes/jupyter_notebook_recipe.py
index d6beebb..0db6f23 100644
--- a/recipes/jupyter_notebook_recipe.py
+++ b/recipes/jupyter_notebook_recipe.py
@@ -13,10 +13,10 @@ from typing import Any, Tuple, Dict
 
 from meow_base.core.base_recipe import BaseRecipe
 from meow_base.core.base_handler import BaseHandler
-from meow_base.core.correctness.meow import valid_event
-from meow_base.core.correctness.validation import check_type, valid_string, \
+from meow_base.core.meow import valid_event
+from meow_base.functionality.validation import check_type, valid_string, \
     valid_dict, valid_path, valid_dir_path, valid_existing_file_path
-from meow_base.core.correctness.vars import VALID_VARIABLE_NAME_CHARS, \
+from meow_base.core.vars import VALID_VARIABLE_NAME_CHARS, \
     PYTHON_FUNC, DEBUG_INFO, EVENT_TYPE_WATCHDOG, \
     DEFAULT_JOB_QUEUE_DIR, EVENT_PATH, JOB_TYPE_PAPERMILL, WATCHDOG_HASH, \
     JOB_PARAMETERS, JOB_ID, WATCHDOG_BASE, META_FILE, PARAMS_FILE, \
@@ -203,7 +203,7 @@ def papermill_job_func(job_dir):
     import os
     import papermill
     from datetime import datetime
-    from meow_base.core.correctness.vars import JOB_EVENT, JOB_ID, \
+    from meow_base.core.vars import JOB_EVENT, JOB_ID, \
         EVENT_PATH, META_FILE, PARAMS_FILE, \
         JOB_STATUS, SHA256, STATUS_SKIPPED, JOB_END_TIME, \
         JOB_ERROR, STATUS_FAILED, get_job_file, \
diff --git a/recipes/python_recipe.py b/recipes/python_recipe.py
index 793e7e4..b0889b1 100644
--- a/recipes/python_recipe.py
+++ b/recipes/python_recipe.py
@@ -12,10 +12,10 @@ from typing import Any, Tuple, Dict, List
 
 from meow_base.core.base_recipe import BaseRecipe
 from meow_base.core.base_handler import BaseHandler
-from meow_base.core.correctness.meow import valid_event
-from meow_base.core.correctness.validation import check_script, valid_string, \
+from meow_base.core.meow import valid_event
+from meow_base.functionality.validation import check_script, valid_string, \
     valid_dict, valid_dir_path
-from meow_base.core.correctness.vars import VALID_VARIABLE_NAME_CHARS, \
+from meow_base.core.vars import VALID_VARIABLE_NAME_CHARS, \
     PYTHON_FUNC, DEBUG_INFO, EVENT_TYPE_WATCHDOG, \
     DEFAULT_JOB_QUEUE_DIR, EVENT_RULE, EVENT_PATH, JOB_TYPE_PYTHON, \
     WATCHDOG_HASH, JOB_PARAMETERS, JOB_ID, WATCHDOG_BASE, META_FILE, \
@@ -179,7 +179,7 @@ def python_job_func(job_dir):
     import os
     from datetime import datetime
     from io import StringIO
-    from meow_base.core.correctness.vars import JOB_EVENT, JOB_ID, \
+    from meow_base.core.vars import JOB_EVENT, JOB_ID, \
         EVENT_PATH, META_FILE, PARAMS_FILE, \
         JOB_STATUS, SHA256, STATUS_SKIPPED, JOB_END_TIME, \
         JOB_ERROR, STATUS_FAILED, get_base_file, \
diff --git a/tests/shared.py b/tests/shared.py
index a7bc417..8b4d4b7 100644
--- a/tests/shared.py
+++ b/tests/shared.py
@@ -7,7 +7,7 @@ import os
 
 from distutils.dir_util import copy_tree
 
-from meow_base.core.correctness.vars import DEFAULT_JOB_OUTPUT_DIR, \
+from meow_base.core.vars import DEFAULT_JOB_OUTPUT_DIR, \
     DEFAULT_JOB_QUEUE_DIR
 from meow_base.functionality.file_io import make_dir, rmtree
 from meow_base.patterns.file_event_pattern import FileEventPattern
diff --git a/tests/test_all.sh b/tests/test_all.sh
index d0008eb..33b3315 100755
--- a/tests/test_all.sh
+++ b/tests/test_all.sh
@@ -11,10 +11,8 @@ skip_long_tests=0
 
 for arg in "$@"
 do
-  echo "Given arg: $arg";
   if [[ $arg == -s ]]
   then
-    echo "skippy the kangaroo"
     skip_long_tests=1
   fi
 done
@@ -31,7 +29,6 @@ do
     && [[ $entry != ./shared.py ]];
   then
     SKIP_LONG=$skip_long_tests pytest $entry "-W ignore::DeprecationWarning"
-#    SKIP_LONG=$skip_long_tests pytest $entry
   fi
 done
 
diff --git a/tests/test_base.py b/tests/test_base.py
index 89deb67..e8b0f5f 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -8,7 +8,7 @@ from meow_base.core.base_handler import BaseHandler
 from meow_base.core.base_monitor import BaseMonitor
 from meow_base.core.base_pattern import BasePattern
 from meow_base.core.base_recipe import BaseRecipe
-from meow_base.core.correctness.vars import SWEEP_STOP, SWEEP_JUMP, SWEEP_START
+from meow_base.core.vars import SWEEP_STOP, SWEEP_JUMP, SWEEP_START
 from meow_base.patterns.file_event_pattern import FileEventPattern
 from shared import setup, teardown
 
diff --git a/tests/test_conductors.py b/tests/test_conductors.py
index e6cce81..d45d6f5 100644
--- a/tests/test_conductors.py
+++ b/tests/test_conductors.py
@@ -6,7 +6,7 @@ import unittest
 from datetime import datetime
 from typing import Dict
 
-from meow_base.core.correctness.vars import JOB_TYPE_PYTHON, SHA256, \
+from meow_base.core.vars import JOB_TYPE_PYTHON, SHA256, \
     JOB_PARAMETERS, PYTHON_FUNC, JOB_ID, BACKUP_JOB_ERROR_FILE, \
     JOB_EVENT, META_FILE, PARAMS_FILE, JOB_STATUS, JOB_ERROR, JOB_TYPE, \
     JOB_PATTERN, STATUS_DONE, JOB_TYPE_PAPERMILL, JOB_RECIPE, JOB_RULE, \
diff --git a/tests/test_functionality.py b/tests/test_functionality.py
index d5aeaac..14fe08a 100644
--- a/tests/test_functionality.py
+++ b/tests/test_functionality.py
@@ -12,7 +12,7 @@ from time import sleep
 from typing import Dict
 
 from meow_base.core.rule import Rule
-from meow_base.core.correctness.vars import CHAR_LOWERCASE, CHAR_UPPERCASE, \
+from meow_base.core.vars import CHAR_LOWERCASE, CHAR_UPPERCASE, \
     SHA256, EVENT_TYPE, EVENT_PATH, EVENT_TYPE_WATCHDOG, \
     WATCHDOG_BASE, WATCHDOG_HASH, EVENT_RULE, JOB_PARAMETERS, \
     PYTHON_FUNC, JOB_ID, JOB_EVENT, \
diff --git a/tests/test_patterns.py b/tests/test_patterns.py
index 5725042..7788f58 100644
--- a/tests/test_patterns.py
+++ b/tests/test_patterns.py
@@ -6,7 +6,7 @@ import unittest
 from multiprocessing import Pipe
 from time import sleep
 
-from meow_base.core.correctness.vars import FILE_CREATE_EVENT, EVENT_TYPE, \
+from meow_base.core.vars import FILE_CREATE_EVENT, EVENT_TYPE, \
     EVENT_RULE, WATCHDOG_BASE, EVENT_TYPE_WATCHDOG, EVENT_PATH, SWEEP_START, \
     SWEEP_JUMP, SWEEP_STOP, DIR_EVENTS
 from meow_base.functionality.file_io import make_dir
diff --git a/tests/test_recipes.py b/tests/test_recipes.py
index 0f34d63..f09dbe1 100644
--- a/tests/test_recipes.py
+++ b/tests/test_recipes.py
@@ -8,8 +8,8 @@ import unittest
 from multiprocessing import Pipe
 from typing import Dict
 
-from meow_base.core.correctness.meow import valid_job
-from meow_base.core.correctness.vars import EVENT_TYPE, WATCHDOG_BASE, \
+from meow_base.core.meow import valid_job
+from meow_base.core.vars import EVENT_TYPE, WATCHDOG_BASE, \
     EVENT_RULE, EVENT_TYPE_WATCHDOG, EVENT_PATH, SHA256, WATCHDOG_HASH, \
     JOB_ID, JOB_TYPE_PYTHON, JOB_PARAMETERS, PYTHON_FUNC, \
     JOB_STATUS, META_FILE, JOB_ERROR, PARAMS_FILE, SWEEP_STOP, SWEEP_JUMP, \
diff --git a/tests/test_runner.py b/tests/test_runner.py
index b132ba1..8545ae7 100644
--- a/tests/test_runner.py
+++ b/tests/test_runner.py
@@ -13,7 +13,7 @@ from meow_base.core.base_conductor import BaseConductor
 from meow_base.core.base_handler import BaseHandler
 from meow_base.core.base_monitor import BaseMonitor
 from meow_base.conductors import LocalPythonConductor
-from meow_base.core.correctness.vars import JOB_TYPE_PAPERMILL, JOB_ERROR, \
+from meow_base.core.vars import JOB_TYPE_PAPERMILL, JOB_ERROR, \
     META_FILE, JOB_TYPE_PYTHON, JOB_CREATE_TIME, get_result_file
 from meow_base.core.runner import MeowRunner
 from meow_base.functionality.file_io import make_dir, read_file, \
@@ -972,7 +972,7 @@ class MeowTests(unittest.TestCase):
 
     # Test some actual scientific analysis, but in a simple progression
     def testScientificAnalysisAllGood(self)->None:
-        if os.environ["SKIP_LONG"]:
+        if os.environ["SKIP_LONG"] and os.environ["SKIP_LONG"] == '1':
             warn("Skipping testScientificAnalysisAllGood")
             return
         
@@ -1096,7 +1096,7 @@ class MeowTests(unittest.TestCase):
 
     # Test some actual scientific analysis, in a predicatable loop
     def testScientificAnalysisPredictableLoop(self)->None:
-        if os.environ["SKIP_LONG"]:
+        if os.environ["SKIP_LONG"] and os.environ["SKIP_LONG"] == '1':
             warn("Skipping testScientificAnalysisPredictableLoop")
             return
         
@@ -1235,7 +1235,7 @@ class MeowTests(unittest.TestCase):
 
     # Test some actual scientific analysis, in an unpredicatable loop
     def testScientificAnalysisRandomLoop(self)->None:
-        if os.environ["SKIP_LONG"]:
+        if os.environ["SKIP_LONG"] and os.environ["SKIP_LONG"] == '1':
             warn("Skipping testScientificAnalysisRandomLoop")
             return
 
@@ -1387,7 +1387,7 @@ class MeowTests(unittest.TestCase):
 
     # Test some actual scientific analysis, in an unpredicatable loop
     def testScientificAnalysisMassiveRandomLoop(self)->None:
-        if os.environ["SKIP_LONG"]:
+        if os.environ["SKIP_LONG"] and os.environ["SKIP_LONG"] == '1':
             warn("Skipping testScientificAnalysisMassiveRandomLoop")
             return
 
diff --git a/tests/test_validation.py b/tests/test_validation.py
index fee10cc..eba5e38 100644
--- a/tests/test_validation.py
+++ b/tests/test_validation.py
@@ -5,13 +5,13 @@ import os
 from datetime import datetime
 from typing import Any, Union
 
-from meow_base.core.correctness.meow import valid_event, valid_job, \
+from meow_base.core.meow import valid_event, valid_job, \
     valid_watchdog_event
-from meow_base.core.correctness.validation import check_type, \
+from meow_base.functionality.validation import check_type, \
     check_implementation, valid_string, valid_dict, valid_list, \
     valid_existing_file_path, valid_dir_path, valid_non_existing_path, \
     check_callable
-from meow_base.core.correctness.vars import VALID_NAME_CHARS, SHA256, \
+from meow_base.core.vars import VALID_NAME_CHARS, SHA256, \
     EVENT_TYPE, EVENT_PATH, JOB_TYPE, JOB_EVENT, JOB_ID, JOB_PATTERN, \
     JOB_RECIPE, JOB_RULE, JOB_STATUS, JOB_CREATE_TIME, EVENT_RULE, \
     WATCHDOG_BASE, WATCHDOG_HASH