diff --git a/.github/workflows/pylint.yaml b/.github/workflows/pylint.yaml
index 8d98917..b5ee0c6 100755
--- a/.github/workflows/pylint.yaml
+++ b/.github/workflows/pylint.yaml
@@ -1,16 +1,27 @@
 name: Pylint
-on: [ pull_request ]
+
+on: [push]
+
 jobs:
-  lint:
+  build:
+
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-          cache: pipenv
-      - run: python -m pip install --upgrade pipenv wheel
-      - run: pipenv install --dev
-      - uses: pr-annotators/pylint-pr-annotator@main
-      - name: Analysing the code with pylint
-        run: pipenv run pylint $(git ls-files '*.py')
\ No newline at end of file
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pylint
+    - name: Analysing the code with pylint
+      run: |
+        find . -name '*.py' -exec pylint {} --fail-under=8 \;
+        pylint_exit_code=$?
+        if [ $pylint_exit_code -ne 0 ]; then
+          echo "Pylint check failed with exit code $pylint_exit_code"
+          exit $pylint_exit_code
+        fi
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 3387da7..e83c14c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@ _tests/files/output-results
 /.idea/workspace.xml
 /.idea/usage.statistics.xml
 /.idea/shelf
-/.vscode
\ No newline at end of file
+/.vscode
+/.idea/inspectionProfiles/Project_Default.xml
+/.idea/Obsidian-Daylio-Parser.bak.iml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
index 105ce2d..3f28a6f 100644
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -1,5 +1,9 @@
 <component name="InspectionProjectProfileManager">
   <settings>
+<<<<<<< HEAD
+=======
+    <option name="PROJECT_PROFILE" value="Default" />
+>>>>>>> refactor-and-unittests
     <option name="USE_PROJECT_PROFILE" value="false" />
     <version value="1.0" />
   </settings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7c3da4b..f187bc3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Black">
-    <option name="sdkName" value="$PROJECT_DIR$/../miniconda3" />
-  </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="$PROJECT_DIR$/../miniconda3" project-jdk-type="Python SDK" />
   <component name="PythonCompatibilityInspectionAdvertiser">
     <option name="version" value="3" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 7739d98..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GitSharedSettings">
-    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
-      <list />
-    </option>
-    <option name="synchronizeBranchProtectionRules" value="false" />
-  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>
diff --git a/Pipfile b/Pipfile
index f3b380c..645a67e 100644
--- a/Pipfile
+++ b/Pipfile
@@ -6,5 +6,6 @@ name = "pypi"
 [packages]
 
 [dev-packages]
-coverage = "*"
-pylint = "*"
+
+[requires]
+python_version = "3.12"
diff --git a/Pipfile.lock b/Pipfile.lock
index d7b9487..b6df5da 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,10 +1,12 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "59f90ce5c85559a1ebe95004e921b19a1a9bf13aa753f54acbe4d4009656ae50"
+            "sha256": "702ad05de9bc9de99a4807c8dde1686f31e0041d7b5f6f6b74861195a52110f5"
         },
         "pipfile-spec": 6,
-        "requires": {},
+        "requires": {
+            "python_version": "3.12"
+        },
         "sources": [
             {
                 "name": "pypi",
@@ -14,122 +16,5 @@
         ]
     },
     "default": {},
-    "develop": {
-        "astroid": {
-            "hashes": [
-                "sha256:4a61cf0a59097c7bb52689b0fd63717cd2a8a14dc9f1eee97b82d814881c8c91",
-                "sha256:d6e62862355f60e716164082d6b4b041d38e2a8cf1c7cd953ded5108bac8ff5c"
-            ],
-            "markers": "python_full_version >= '3.8.0'",
-            "version": "==3.0.2"
-        },
-        "coverage": {
-            "hashes": [
-                "sha256:04387a4a6ecb330c1878907ce0dc04078ea72a869263e53c72a1ba5bbdf380ca",
-                "sha256:0676cd0ba581e514b7f726495ea75aba3eb20899d824636c6f59b0ed2f88c471",
-                "sha256:0e8d06778e8fbffccfe96331a3946237f87b1e1d359d7fbe8b06b96c95a5407a",
-                "sha256:0eb3c2f32dabe3a4aaf6441dde94f35687224dfd7eb2a7f47f3fd9428e421058",
-                "sha256:109f5985182b6b81fe33323ab4707011875198c41964f014579cf82cebf2bb85",
-                "sha256:13eaf476ec3e883fe3e5fe3707caeb88268a06284484a3daf8250259ef1ba143",
-                "sha256:164fdcc3246c69a6526a59b744b62e303039a81e42cfbbdc171c91a8cc2f9446",
-                "sha256:26776ff6c711d9d835557ee453082025d871e30b3fd6c27fcef14733f67f0590",
-                "sha256:26f66da8695719ccf90e794ed567a1549bb2644a706b41e9f6eae6816b398c4a",
-                "sha256:29f3abe810930311c0b5d1a7140f6395369c3db1be68345638c33eec07535105",
-                "sha256:316543f71025a6565677d84bc4df2114e9b6a615aa39fb165d697dba06a54af9",
-                "sha256:36b0ea8ab20d6a7564e89cb6135920bc9188fb5f1f7152e94e8300b7b189441a",
-                "sha256:3cc9d4bc55de8003663ec94c2f215d12d42ceea128da8f0f4036235a119c88ac",
-                "sha256:485e9f897cf4856a65a57c7f6ea3dc0d4e6c076c87311d4bc003f82cfe199d25",
-                "sha256:5040148f4ec43644702e7b16ca864c5314ccb8ee0751ef617d49aa0e2d6bf4f2",
-                "sha256:51456e6fa099a8d9d91497202d9563a320513fcf59f33991b0661a4a6f2ad450",
-                "sha256:53d7d9158ee03956e0eadac38dfa1ec8068431ef8058fe6447043db1fb40d932",
-                "sha256:5a10a4920def78bbfff4eff8a05c51be03e42f1c3735be42d851f199144897ba",
-                "sha256:5b14b4f8760006bfdb6e08667af7bc2d8d9bfdb648351915315ea17645347137",
-                "sha256:5b2ccb7548a0b65974860a78c9ffe1173cfb5877460e5a229238d985565574ae",
-                "sha256:697d1317e5290a313ef0d369650cfee1a114abb6021fa239ca12b4849ebbd614",
-                "sha256:6ae8c9d301207e6856865867d762a4b6fd379c714fcc0607a84b92ee63feff70",
-                "sha256:707c0f58cb1712b8809ece32b68996ee1e609f71bd14615bd8f87a1293cb610e",
-                "sha256:74775198b702868ec2d058cb92720a3c5a9177296f75bd97317c787daf711505",
-                "sha256:756ded44f47f330666843b5781be126ab57bb57c22adbb07d83f6b519783b870",
-                "sha256:76f03940f9973bfaee8cfba70ac991825611b9aac047e5c80d499a44079ec0bc",
-                "sha256:79287fd95585ed36e83182794a57a46aeae0b64ca53929d1176db56aacc83451",
-                "sha256:799c8f873794a08cdf216aa5d0531c6a3747793b70c53f70e98259720a6fe2d7",
-                "sha256:7d360587e64d006402b7116623cebf9d48893329ef035278969fa3bbf75b697e",
-                "sha256:80b5ee39b7f0131ebec7968baa9b2309eddb35b8403d1869e08f024efd883566",
-                "sha256:815ac2d0f3398a14286dc2cea223a6f338109f9ecf39a71160cd1628786bc6f5",
-                "sha256:83c2dda2666fe32332f8e87481eed056c8b4d163fe18ecc690b02802d36a4d26",
-                "sha256:846f52f46e212affb5bcf131c952fb4075b55aae6b61adc9856222df89cbe3e2",
-                "sha256:936d38794044b26c99d3dd004d8af0035ac535b92090f7f2bb5aa9c8e2f5cd42",
-                "sha256:9864463c1c2f9cb3b5db2cf1ff475eed2f0b4285c2aaf4d357b69959941aa555",
-                "sha256:995ea5c48c4ebfd898eacb098164b3cc826ba273b3049e4a889658548e321b43",
-                "sha256:a1526d265743fb49363974b7aa8d5899ff64ee07df47dd8d3e37dcc0818f09ed",
-                "sha256:a56de34db7b7ff77056a37aedded01b2b98b508227d2d0979d373a9b5d353daa",
-                "sha256:a7c97726520f784239f6c62506bc70e48d01ae71e9da128259d61ca5e9788516",
-                "sha256:b8e99f06160602bc64da35158bb76c73522a4010f0649be44a4e167ff8555952",
-                "sha256:bb1de682da0b824411e00a0d4da5a784ec6496b6850fdf8c865c1d68c0e318dd",
-                "sha256:bf477c355274a72435ceb140dc42de0dc1e1e0bf6e97195be30487d8eaaf1a09",
-                "sha256:bf635a52fc1ea401baf88843ae8708591aa4adff875e5c23220de43b1ccf575c",
-                "sha256:bfd5db349d15c08311702611f3dccbef4b4e2ec148fcc636cf8739519b4a5c0f",
-                "sha256:c530833afc4707fe48524a44844493f36d8727f04dcce91fb978c414a8556cc6",
-                "sha256:cc6d65b21c219ec2072c1293c505cf36e4e913a3f936d80028993dd73c7906b1",
-                "sha256:cd3c1e4cb2ff0083758f09be0f77402e1bdf704adb7f89108007300a6da587d0",
-                "sha256:cfd2a8b6b0d8e66e944d47cdec2f47c48fef2ba2f2dff5a9a75757f64172857e",
-                "sha256:d0ca5c71a5a1765a0f8f88022c52b6b8be740e512980362f7fdbb03725a0d6b9",
-                "sha256:e7defbb9737274023e2d7af02cac77043c86ce88a907c58f42b580a97d5bcca9",
-                "sha256:e9d1bf53c4c8de58d22e0e956a79a5b37f754ed1ffdbf1a260d9dcfa2d8a325e",
-                "sha256:ea81d8f9691bb53f4fb4db603203029643caffc82bf998ab5b59ca05560f4c06"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==7.4.0"
-        },
-        "dill": {
-            "hashes": [
-                "sha256:76b122c08ef4ce2eedcd4d1abd8e641114bfc6c2867f49f3c41facf65bf19f5e",
-                "sha256:cc1c8b182eb3013e24bd475ff2e9295af86c1a38eb1aff128dac8962a9ce3c03"
-            ],
-            "markers": "python_version >= '3.11'",
-            "version": "==0.3.7"
-        },
-        "isort": {
-            "hashes": [
-                "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109",
-                "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"
-            ],
-            "markers": "python_full_version >= '3.8.0'",
-            "version": "==5.13.2"
-        },
-        "mccabe": {
-            "hashes": [
-                "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325",
-                "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==0.7.0"
-        },
-        "platformdirs": {
-            "hashes": [
-                "sha256:11c8f37bcca40db96d8144522d925583bdb7a31f7b0e37e3ed4318400a8e2380",
-                "sha256:906d548203468492d432bcb294d4bc2fff751bf84971fbb2c10918cc206ee420"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==4.1.0"
-        },
-        "pylint": {
-            "hashes": [
-                "sha256:58c2398b0301e049609a8429789ec6edf3aabe9b6c5fec916acd18639c16de8b",
-                "sha256:7a1585285aefc5165db81083c3e06363a27448f6b467b3b0f30dbd0ac1f73810"
-            ],
-            "index": "pypi",
-            "markers": "python_full_version >= '3.8.0'",
-            "version": "==3.0.3"
-        },
-        "tomlkit": {
-            "hashes": [
-                "sha256:75baf5012d06501f07bee5bf8e801b9f343e7aac5a92581f20f80ce632e6b5a4",
-                "sha256:b0a645a9156dc7cb5d3a1f0d4bab66db287fcb8e0430bdd4664a095ea16414ba"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==0.12.3"
-        }
-    }
+    "develop": {}
 }
diff --git a/_tests/empty_sheet.csv b/_tests/empty_sheet.csv
index a021e19..e69de29 100755
--- a/_tests/empty_sheet.csv
+++ b/_tests/empty_sheet.csv
@@ -1,13 +0,0 @@
-full_date,date,weekday,time,mood,activities,note_title,note
-2022-10-30,October 30,Sunday,10:04 AM,vaguely ok,2ćities  skylines | dó#lóó fa$$s_ą%,"Dolomet","Lorem ipsum sit dolomet amęt."
-2022-10-27,October 27,Thursday,1:49 PM,vaguely good,chess,"Cras pretium","Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-2022-10-27,October 27,Thursday,12:00 AM,fatigued,allegro | working remotely,"Suspendisse sit amet","Phaśellus pharetra justo ac dui lacinia ullamcorper."
-2022-10-26,October 26,Wednesday,10:00 PM,captivated,at the office | board game | colleague interaction | big social gathering,,"Sed ut est interdum","Maecenas dictum augue in nibh pellentesque porttitor."
-2022-10-26,October 26,Wednesday,8:00 PM,tired,allegro | at the office | board game | colleague interaction | big social gathering,"Mauris rutrum diam","Quisque dictum odio quis augue consectetur, at convallis żodio aliquam."
-2022-10-26,October 26,Wednesday,7:30 PM,grateful,allegro | at the office | acknowledged efforts | colleague interaction,"Aliquam nec sem semper","Nulla aćcumsan sem sit amet lectus pretium, ac interdum tellus porta."
-2022-10-26,October 26,Wednesday,1:00 PM,blissful,allegro | at the office,"Vestibulum sagittis leo eu sodales","Ut et elit id lectus hendrerit ełementum quis auctor ipsum."
-2022-10-26,October 26,Wednesday,9:00 AM,in awe,allegro | at the office | outdoors | notable event,"Integer elementum","Nunc lobortis enim eu nisi ultrices, sit amet sagittis lacus venenatis."
-2022-10-26,October 26,Wednesday,7:50 AM,lifeless,podcast | politics | world event,"Nulla quis lectus pulvinar","Etiam commódo enim ut orci varius viverra."
-2022-10-25,October 25,Tuesday,11:36 PM,hungry,allegro | working remotely | colleague interaction,"Mauris vitae nunc vel arcu consequat auctor","Nulla vel risus eget magna lacinia aliquam ac in arcu."
-2022-10-25,October 25,Tuesday,11:40 PM,rad,,,Uet nulla nunc lobortis quisque.
-2022-10-25,October 25,Tuesday,5:00 PM,vaguely ok,,,
\ No newline at end of file
diff --git a/_tests/expected_results/2022-10-25.md b/_tests/expected_results/2022-10-25.md
index f0ec8a9..e69de29 100755
--- a/_tests/expected_results/2022-10-25.md
+++ b/_tests/expected_results/2022-10-25.md
@@ -1,13 +0,0 @@
----
-tags: daily
----
-
-## hungry | 11:36 PM | Mauris vitae nunc vel arcu consequat auctor
-#allegro #working-remotely #colleague-interaction
-Nulla vel risus eget magna lacinia aliquam ac in arcu.
-
-## rad | 11:40 PM
-Uet nulla nunc lobortis quisque.
-
-## vaguely ok | 5:00 PM
-
diff --git a/_tests/expected_results/2022-10-26.md b/_tests/expected_results/2022-10-26.md
index b22e48e..e69de29 100755
--- a/_tests/expected_results/2022-10-26.md
+++ b/_tests/expected_results/2022-10-26.md
@@ -1,28 +0,0 @@
----
-tags: daily
----
-
-## captivated | 10:00 PM
-#at-the-office #board-game #colleague-interaction #big-social-gathering
-Sed ut est interdum
-
-## tired | 8:00 PM | Mauris rutrum diam
-#allegro #at-the-office #board-game #colleague-interaction #big-social-gathering
-Quisque dictum odio quis augue consectetur, at convallis żodio aliquam.
-
-## grateful | 7:30 PM | Aliquam nec sem semper
-#allegro #at-the-office #acknowledged-efforts #colleague-interaction
-Nulla aćcumsan sem sit amet lectus pretium, ac interdum tellus porta.
-
-## blissful | 1:00 PM | Vestibulum sagittis leo eu sodales
-#allegro #at-the-office
-Ut et elit id lectus hendrerit ełementum quis auctor ipsum.
-
-## in awe | 9:00 AM | Integer elementum
-#allegro #at-the-office #outdoors #notable-event
-Nunc lobortis enim eu nisi ultrices, sit amet sagittis lacus venenatis.
-
-## lifeless | 7:50 AM | Nulla quis lectus pulvinar
-#podcast #politics #world-event
-Etiam commódo enim ut orci varius viverra.
-
diff --git a/_tests/expected_results/2022-10-27.md b/_tests/expected_results/2022-10-27.md
index 6166989..e69de29 100755
--- a/_tests/expected_results/2022-10-27.md
+++ b/_tests/expected_results/2022-10-27.md
@@ -1,12 +0,0 @@
----
-tags: daily
----
-
-## vaguely good | 1:49 PM | Cras pretium
-#chess
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-
-## fatigued | 12:00 AM | Suspendisse sit amet
-#allegro #working-remotely
-Phaśellus pharetra justo ac dui lacinia ullamcorper.
-
diff --git a/_tests/expected_results/2022-10-30.md b/_tests/expected_results/2022-10-30.md
index 3c88ad3..e69de29 100755
--- a/_tests/expected_results/2022-10-30.md
+++ b/_tests/expected_results/2022-10-30.md
@@ -1,8 +0,0 @@
----
-tags: daily
----
-
-## vaguely ok | 10:04 AM | Dolomet
-#2ćities-skylines #dólóó-fas_ą
-Lorem ipsum sit dolomet amęt.
-
diff --git a/_tests/files/expected_results/2022-10-25.md b/_tests/files/expected_results/2022-10-25.md
new file mode 100755
index 0000000..f0ec8a9
--- /dev/null
+++ b/_tests/files/expected_results/2022-10-25.md
@@ -0,0 +1,13 @@
+---
+tags: daily
+---
+
+## hungry | 11:36 PM | Mauris vitae nunc vel arcu consequat auctor
+#allegro #working-remotely #colleague-interaction
+Nulla vel risus eget magna lacinia aliquam ac in arcu.
+
+## rad | 11:40 PM
+Uet nulla nunc lobortis quisque.
+
+## vaguely ok | 5:00 PM
+
diff --git a/_tests/files/expected_results/2022-10-26.md b/_tests/files/expected_results/2022-10-26.md
new file mode 100755
index 0000000..b22e48e
--- /dev/null
+++ b/_tests/files/expected_results/2022-10-26.md
@@ -0,0 +1,28 @@
+---
+tags: daily
+---
+
+## captivated | 10:00 PM
+#at-the-office #board-game #colleague-interaction #big-social-gathering
+Sed ut est interdum
+
+## tired | 8:00 PM | Mauris rutrum diam
+#allegro #at-the-office #board-game #colleague-interaction #big-social-gathering
+Quisque dictum odio quis augue consectetur, at convallis żodio aliquam.
+
+## grateful | 7:30 PM | Aliquam nec sem semper
+#allegro #at-the-office #acknowledged-efforts #colleague-interaction
+Nulla aćcumsan sem sit amet lectus pretium, ac interdum tellus porta.
+
+## blissful | 1:00 PM | Vestibulum sagittis leo eu sodales
+#allegro #at-the-office
+Ut et elit id lectus hendrerit ełementum quis auctor ipsum.
+
+## in awe | 9:00 AM | Integer elementum
+#allegro #at-the-office #outdoors #notable-event
+Nunc lobortis enim eu nisi ultrices, sit amet sagittis lacus venenatis.
+
+## lifeless | 7:50 AM | Nulla quis lectus pulvinar
+#podcast #politics #world-event
+Etiam commódo enim ut orci varius viverra.
+
diff --git a/_tests/files/expected_results/2022-10-27.md b/_tests/files/expected_results/2022-10-27.md
new file mode 100755
index 0000000..6166989
--- /dev/null
+++ b/_tests/files/expected_results/2022-10-27.md
@@ -0,0 +1,12 @@
+---
+tags: daily
+---
+
+## vaguely good | 1:49 PM | Cras pretium
+#chess
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+
+## fatigued | 12:00 AM | Suspendisse sit amet
+#allegro #working-remotely
+Phaśellus pharetra justo ac dui lacinia ullamcorper.
+
diff --git a/_tests/files/expected_results/2022-10-30.md b/_tests/files/expected_results/2022-10-30.md
new file mode 100755
index 0000000..3c88ad3
--- /dev/null
+++ b/_tests/files/expected_results/2022-10-30.md
@@ -0,0 +1,8 @@
+---
+tags: daily
+---
+
+## vaguely ok | 10:04 AM | Dolomet
+#2ćities-skylines #dólóó-fas_ą
+Lorem ipsum sit dolomet amęt.
+
diff --git a/_tests/files/journal_CSVs/empty_sheet.csv b/_tests/files/journal_CSVs/empty_sheet.csv
new file mode 100755
index 0000000..a021e19
--- /dev/null
+++ b/_tests/files/journal_CSVs/empty_sheet.csv
@@ -0,0 +1,13 @@
+full_date,date,weekday,time,mood,activities,note_title,note
+2022-10-30,October 30,Sunday,10:04 AM,vaguely ok,2ćities  skylines | dó#lóó fa$$s_ą%,"Dolomet","Lorem ipsum sit dolomet amęt."
+2022-10-27,October 27,Thursday,1:49 PM,vaguely good,chess,"Cras pretium","Lorem ipsum dolor sit amet, consectetur adipiscing elit."
+2022-10-27,October 27,Thursday,12:00 AM,fatigued,allegro | working remotely,"Suspendisse sit amet","Phaśellus pharetra justo ac dui lacinia ullamcorper."
+2022-10-26,October 26,Wednesday,10:00 PM,captivated,at the office | board game | colleague interaction | big social gathering,,"Sed ut est interdum","Maecenas dictum augue in nibh pellentesque porttitor."
+2022-10-26,October 26,Wednesday,8:00 PM,tired,allegro | at the office | board game | colleague interaction | big social gathering,"Mauris rutrum diam","Quisque dictum odio quis augue consectetur, at convallis żodio aliquam."
+2022-10-26,October 26,Wednesday,7:30 PM,grateful,allegro | at the office | acknowledged efforts | colleague interaction,"Aliquam nec sem semper","Nulla aćcumsan sem sit amet lectus pretium, ac interdum tellus porta."
+2022-10-26,October 26,Wednesday,1:00 PM,blissful,allegro | at the office,"Vestibulum sagittis leo eu sodales","Ut et elit id lectus hendrerit ełementum quis auctor ipsum."
+2022-10-26,October 26,Wednesday,9:00 AM,in awe,allegro | at the office | outdoors | notable event,"Integer elementum","Nunc lobortis enim eu nisi ultrices, sit amet sagittis lacus venenatis."
+2022-10-26,October 26,Wednesday,7:50 AM,lifeless,podcast | politics | world event,"Nulla quis lectus pulvinar","Etiam commódo enim ut orci varius viverra."
+2022-10-25,October 25,Tuesday,11:36 PM,hungry,allegro | working remotely | colleague interaction,"Mauris vitae nunc vel arcu consequat auctor","Nulla vel risus eget magna lacinia aliquam ac in arcu."
+2022-10-25,October 25,Tuesday,11:40 PM,rad,,,Uet nulla nunc lobortis quisque.
+2022-10-25,October 25,Tuesday,5:00 PM,vaguely ok,,,
\ No newline at end of file
diff --git a/_tests/files/journal_CSVs/sheet-1-valid-data.csv b/_tests/files/journal_CSVs/sheet-1-valid-data.csv
new file mode 100755
index 0000000..a021e19
--- /dev/null
+++ b/_tests/files/journal_CSVs/sheet-1-valid-data.csv
@@ -0,0 +1,13 @@
+full_date,date,weekday,time,mood,activities,note_title,note
+2022-10-30,October 30,Sunday,10:04 AM,vaguely ok,2ćities  skylines | dó#lóó fa$$s_ą%,"Dolomet","Lorem ipsum sit dolomet amęt."
+2022-10-27,October 27,Thursday,1:49 PM,vaguely good,chess,"Cras pretium","Lorem ipsum dolor sit amet, consectetur adipiscing elit."
+2022-10-27,October 27,Thursday,12:00 AM,fatigued,allegro | working remotely,"Suspendisse sit amet","Phaśellus pharetra justo ac dui lacinia ullamcorper."
+2022-10-26,October 26,Wednesday,10:00 PM,captivated,at the office | board game | colleague interaction | big social gathering,,"Sed ut est interdum","Maecenas dictum augue in nibh pellentesque porttitor."
+2022-10-26,October 26,Wednesday,8:00 PM,tired,allegro | at the office | board game | colleague interaction | big social gathering,"Mauris rutrum diam","Quisque dictum odio quis augue consectetur, at convallis żodio aliquam."
+2022-10-26,October 26,Wednesday,7:30 PM,grateful,allegro | at the office | acknowledged efforts | colleague interaction,"Aliquam nec sem semper","Nulla aćcumsan sem sit amet lectus pretium, ac interdum tellus porta."
+2022-10-26,October 26,Wednesday,1:00 PM,blissful,allegro | at the office,"Vestibulum sagittis leo eu sodales","Ut et elit id lectus hendrerit ełementum quis auctor ipsum."
+2022-10-26,October 26,Wednesday,9:00 AM,in awe,allegro | at the office | outdoors | notable event,"Integer elementum","Nunc lobortis enim eu nisi ultrices, sit amet sagittis lacus venenatis."
+2022-10-26,October 26,Wednesday,7:50 AM,lifeless,podcast | politics | world event,"Nulla quis lectus pulvinar","Etiam commódo enim ut orci varius viverra."
+2022-10-25,October 25,Tuesday,11:36 PM,hungry,allegro | working remotely | colleague interaction,"Mauris vitae nunc vel arcu consequat auctor","Nulla vel risus eget magna lacinia aliquam ac in arcu."
+2022-10-25,October 25,Tuesday,11:40 PM,rad,,,Uet nulla nunc lobortis quisque.
+2022-10-25,October 25,Tuesday,5:00 PM,vaguely ok,,,
\ No newline at end of file
diff --git a/_tests/files/journal_CSVs/sheet-2-corrupted-bytes.csv b/_tests/files/journal_CSVs/sheet-2-corrupted-bytes.csv
new file mode 100755
index 0000000..bb764a3
Binary files /dev/null and b/_tests/files/journal_CSVs/sheet-2-corrupted-bytes.csv differ
diff --git a/_tests/files/journal_CSVs/sheet-3-wrong-format.txt b/_tests/files/journal_CSVs/sheet-3-wrong-format.txt
new file mode 100755
index 0000000..ccb1d35
--- /dev/null
+++ b/_tests/files/journal_CSVs/sheet-3-wrong-format.txt
@@ -0,0 +1,2 @@
+this is just a text file
+ok, nothing to see here
\ No newline at end of file
diff --git a/_tests/files/journal_CSVs/sheet-4-no-extension b/_tests/files/journal_CSVs/sheet-4-no-extension
new file mode 100755
index 0000000..44f254f
Binary files /dev/null and b/_tests/files/journal_CSVs/sheet-4-no-extension differ
diff --git a/_tests/files/journal_CSVs/sheet-6-empty-file.csv b/_tests/files/journal_CSVs/sheet-6-empty-file.csv
new file mode 100644
index 0000000..e69de29
diff --git a/_tests/files/locked-dir/locked_file.csv b/_tests/files/locked-dir/locked_file.csv
new file mode 100755
index 0000000..644809c
--- /dev/null
+++ b/_tests/files/locked-dir/locked_file.csv
@@ -0,0 +1,2 @@
+one,two,three,four,five
+six,seven,eight,nine,ten
diff --git a/_tests/files/mood_JSONs/incomplete-moods.json b/_tests/files/mood_JSONs/incomplete-moods.json
new file mode 100755
index 0000000..441ab91
--- /dev/null
+++ b/_tests/files/mood_JSONs/incomplete-moods.json
@@ -0,0 +1,21 @@
+{
+    "rad": [
+        "rad",
+        "blissful"
+    ],
+    "neutral": [
+        "vaguely ok",
+        "a bit helpless"
+    ],
+    "bad": [
+        "vaguely bad",
+        "helpless",
+        "misunderstood"
+    ],
+    "awful": [
+        "vaguely awful",
+        "hollow",
+        "trapped",
+        "dying of pain"
+    ]
+}
diff --git a/_tests/test_config.py b/_tests/test_config.py
index e2ae8aa..6dd3d18 100644
--- a/_tests/test_config.py
+++ b/_tests/test_config.py
@@ -20,12 +20,12 @@ def test_spoofed_keyword_option_without_equality_sign(self):
         # User input not in the dictionary of allowed options - should fail
         with self.assertRaises(SystemExit) as cm:
             options_to_check.parse_console(["--force", "yo-mama"])
-        self.assertEqual(cm.exception.code, 2, msg="Invalid arguments were passed to argparse so it should exit with 2")
+        self.assertEqual(2, cm.exception.code, msg="Invalid arguments were passed to argparse so it should exit with 2")
 
         # User input provided both options - should fail
         with self.assertRaises(SystemExit) as cm:
             options_to_check.parse_console(["--force", "refuse", "accept"])
-        self.assertEqual(cm.exception.code, 2, msg="Cannot both force-refuse and force-accept - should exit with 2")
+        self.assertEqual(2, cm.exception.code, msg="Cannot both force-refuse and force-accept - should exit with 2")
 
         # User input correct - should pass
         options_to_check.parse_console(["--force", "refuse"])
@@ -47,20 +47,20 @@ def test_spoofed_keyword_option_with_equality_sign(self):
         # User input not in the dictionary of allowed options - should fail
         with self.assertRaises(SystemExit) as cm:
             options_to_check.parse_console(["--force=yo-mama"])
-        self.assertEqual(cm.exception.code, 2, msg="Invalid arguments were passed to argparse so it should exit with 2")
+        self.assertEqual(2, cm.exception.code, msg="Invalid arguments were passed to argparse so it should exit with 2")
 
         # User input provided both options - should fail
         with self.assertRaises(SystemExit) as cm:
             options_to_check.parse_console(["--force=refuse --force=accept"])
-        self.assertEqual(cm.exception.code, 2, msg="Cannot both force-refuse and force-accept - should exit with 2")
+        self.assertEqual(2, cm.exception.code, msg="Cannot both force-refuse and force-accept - should exit with 2")
 
         # User input correct - should pass
         options_to_check.parse_console(["--force=refuse"])
-        self.assertEqual(options_to_check.force, "refuse")
+        self.assertEqual("refuse", options_to_check.force)
 
         # User input correct - should pass
         options_to_check.parse_console(["--force=accept"])
-        self.assertEqual(options_to_check.force, "accept")
+        self.assertEqual("accept", options_to_check.force)
 
     def test_check_if_required_arguments_passed(self):
         # Setup
@@ -78,11 +78,11 @@ def test_check_if_required_arguments_passed(self):
         with self.assertRaises(SystemExit) as cm:
             options_to_check.parse_console(["--optional_arg", "haha"])
             print(options_to_check)
-        self.assertEqual(cm.exception.code, 2, msg="No filepath provided - should exit with 2")
+        self.assertEqual(2, cm.exception.code, msg="No filepath provided - should exit with 2")
 
         # User input correct - should pass
         options_to_check.parse_console(["wakanda forever"])
-        self.assertEqual(options_to_check.filepath, "wakanda forever")
+        self.assertEqual("wakanda forever", options_to_check.filepath)
 
     def test_expected_failure_empty_argument_array(self):
         # Setup
@@ -95,7 +95,7 @@ def test_expected_failure_empty_argument_array(self):
         # User provided no arguments whatsoever - should fail
         with self.assertRaises(SystemExit) as cm:
             options_to_check.parse_console([])
-        self.assertEqual(cm.exception.code, 2, msg="No arguments provided to argparse so it should exit with 2")
+        self.assertEqual(2, cm.exception.code, msg="No arguments provided to argparse so it should exit with 2")
 
     # TODO: test Namespace=self where SettingsManager overwrites its default attributes with argparse
     def test_if_settings_manager_overwrites_its_properties_from_console(self):
@@ -124,8 +124,8 @@ def test_if_settings_manager_overwrites_its_properties_from_console(self):
 
         # User input correct - should pass
         options_to_check.parse_console(["this is NOT the default value", "hello", "world"])
-        self.assertEqual(options_to_check.filepath, "this is NOT the default value")
-        self.assertNotEqual(options_to_check.filepath, "this is the default value")
+        self.assertEqual("this is NOT the default value", options_to_check.filepath)
+        self.assertNotEqual("this is the default value", options_to_check.filepath)
         # because neither "foo" nor "bar" is part of the SettingsManager class, I need to access it like a key in dict
-        self.assertEqual(vars(options_to_check)["foo"], "hello")
-        self.assertEqual(vars(options_to_check)["bar"], "world")
+        self.assertEqual("hello", vars(options_to_check)["foo"])
+        self.assertEqual("world", vars(options_to_check)["bar"])
diff --git a/_tests/test_dated_entries_group.py b/_tests/test_dated_entries_group.py
index e29767d..7c46d1e 100644
--- a/_tests/test_dated_entries_group.py
+++ b/_tests/test_dated_entries_group.py
@@ -74,9 +74,9 @@ def test_create_dated_entries_groups(self):
         """
         Try to instantiate an object of :class:`DatedEntriesGroup` with either valid or invalid dates
         """
-        self.assertEqual(str(DatedEntriesGroup("2023-10-15")), "2023-10-15")
-        self.assertEqual(str(DatedEntriesGroup("2019-5-9")), "2019-5-9")
-        self.assertEqual(str(DatedEntriesGroup("2023-11-25")), "2023-11-25")
+        self.assertEqual("2023-10-15", str(DatedEntriesGroup("2023-10-15")))
+        self.assertEqual("2019-5-9", str(DatedEntriesGroup("2019-5-9")))
+        self.assertEqual("2023-11-25", str(DatedEntriesGroup("2023-11-25")))
 
         self.assertRaises(InvalidDateError, DatedEntriesGroup, "00-")
         self.assertRaises(InvalidDateError, DatedEntriesGroup, "2199-32-32")
@@ -113,8 +113,8 @@ def test_access_dated_entry(self):
         Tries to either access existing entries through :func:`access_dated_entry` or missing ones.
         Expected behaviour is for the :class:`DatedEntryGroup` to return the entry object if exists or raise exception.
         """
-        self.assertEqual(str(self.sample_date.access_dated_entry("10:00 AM")), "10:00 AM")
-        self.assertEqual(str(self.sample_date.access_dated_entry("9:30 PM")), "9:30 PM")
+        self.assertEqual("10:00 AM", str(self.sample_date.access_dated_entry("10:00 AM")))
+        self.assertEqual("9:30 PM", str(self.sample_date.access_dated_entry("9:30 PM")))
 
         # Test cases for 12-hour format
         self.assertRaises(DatedEntryMissingError, self.sample_date.access_dated_entry, "2: AM")  # <- no minutes
@@ -146,8 +146,8 @@ def test_get_known_dated_entries(self):
         - former will raise ValueError if time is invalid
         - latter will raise KeyError if time is invalid
         """
-        self.assertEqual(str(self.sample_date.known_entries_from_this_day["9:30 PM"]), "9:30 PM")
-        self.assertEqual(str(self.sample_date.known_entries_from_this_day["10:00 AM"]), "10:00 AM")
+        self.assertEqual("9:30 PM", str(self.sample_date.known_entries_from_this_day["9:30 PM"]))
+        self.assertEqual("10:00 AM", str(self.sample_date.known_entries_from_this_day["10:00 AM"]))
 
         self.assertRaises(KeyError, lambda: self.sample_date.known_entries_from_this_day["23:00"])
         self.assertRaises(KeyError, lambda: self.sample_date.known_entries_from_this_day["11:50 AM"])
diff --git a/_tests/test_dated_entry.py b/_tests/test_dated_entry.py
index 8607b81..ca53d93 100644
--- a/_tests/test_dated_entry.py
+++ b/_tests/test_dated_entry.py
@@ -1,20 +1,61 @@
 from unittest import TestCase
 
+from src.config import options
 from src.dated_entry import \
     Time, \
-    slice_quotes, \
     DatedEntry, \
-    IsNotTimeError
+    IsNotTimeError, \
+    is_time_format_valid, \
+    is_time_range_valid
 
 
-# TODO: more test coverage needed
-
 class TestDatedEntryUtils(TestCase):
-    def test_slice_quotes(self):
-        # TODO: Flip values in assertions, because unittest's 'first' param is expected, 'second' is actual.
-        self.assertEqual(slice_quotes("\"test\""), "test")
-        self.assertEqual(slice_quotes("\"\""), "")
-        self.assertEqual(slice_quotes("\" bicycle   \""), "bicycle")
+    def test_is_time_format_valid(self):
+        self.assertTrue(is_time_format_valid("1:49 AM"))
+        self.assertTrue(is_time_format_valid("02:15"))
+        self.assertTrue(is_time_format_valid("12:00"))
+        self.assertTrue(is_time_format_valid("1:49 PM"))
+        self.assertFalse(is_time_format_valid("1::49"))
+        self.assertFalse(is_time_format_valid("12:60 AM"))
+        # noinspection SpellCheckingInspection
+        self.assertFalse(is_time_format_valid("okk:oksdf s"))
+        self.assertFalse(is_time_format_valid("25:00 AM"))
+        self.assertFalse(is_time_format_valid("26:10"))
+        self.assertFalse(is_time_format_valid("12:60 PM"))
+        self.assertFalse(is_time_format_valid("12:00 XX"))
+        self.assertFalse(is_time_format_valid("abc:def AM"))
+        self.assertFalse(is_time_format_valid("abc:def XM"))
+        self.assertFalse(is_time_format_valid("24:00 PM"))
+        self.assertFalse(is_time_format_valid("00:61 AM"))
+        self.assertFalse(is_time_format_valid("---"))
+        self.assertFalse(is_time_format_valid("23y7vg"))
+        self.assertFalse(is_time_format_valid("::::"))
+        self.assertFalse(is_time_format_valid("????"))
+        self.assertFalse(is_time_format_valid("00000:000000000000"))
+        self.assertFalse(is_time_format_valid("99:12"))
+        self.assertFalse(is_time_format_valid("11:12 UU"))
+        self.assertFalse(is_time_format_valid("9::12"))
+
+        # as expected, this will return True, because we're not checking ranges yet
+        self.assertTrue(is_time_format_valid("14:59 AM"))
+
+    def test_is_time_range_valid(self):
+        self.assertTrue(is_time_range_valid("11:00 AM"))
+        self.assertTrue(is_time_range_valid("3:00 AM"))
+        self.assertTrue(is_time_range_valid("7:59 AM"))
+        self.assertTrue(is_time_range_valid("17:50"))
+        self.assertTrue(is_time_range_valid("21:37"))
+        self.assertTrue(is_time_range_valid("00:00"))
+        self.assertTrue(is_time_range_valid("14:25"))
+
+        self.assertFalse(is_time_range_valid("31:00"))
+        self.assertFalse(is_time_range_valid("11:79"))
+        self.assertFalse(is_time_range_valid("20:99 PM"))
+        self.assertFalse(is_time_range_valid("-5:12"))
+        self.assertFalse(is_time_range_valid("-5:-12"))
+        self.assertFalse(is_time_range_valid("-5:-12"))
+        self.assertFalse(is_time_range_valid("13:00 AM"))
+        self.assertFalse(is_time_range_valid("15:00 PM"))
 
 
 class TestTime(TestCase):
@@ -30,6 +71,15 @@ def test_try_creating_valid_times(self):
         self.assertTrue(Time("13:30"))
         self.assertTrue(Time("9:45"))
 
+    def test_try_whitespaces(self):
+        self.assertTrue(Time("    1:49 AM  "))
+        self.assertTrue(Time("02:15 AM    "))
+        self.assertTrue(Time("      12:00 PM"))
+        # Leading 0 or not is consistent which what was passed, not with what the function thinks is best
+        self.assertEqual("1:49 AM", str(Time("    1:49 AM  ")))
+        self.assertEqual("02:15 AM", str(Time("02:15 AM    ")))
+        self.assertEqual("12:00 PM", str(Time("      12:00 PM")))
+
     def test_try_creating_invalid_times(self):
         # Invalid time formats
         # noinspection SpellCheckingInspection
@@ -43,6 +93,17 @@ def test_try_creating_invalid_times(self):
         self.assertRaises(IsNotTimeError, Time, "24:00 PM")
         self.assertRaises(IsNotTimeError, Time, "00:61 AM")
 
+    def test_str(self):
+        self.assertEqual("1:49 AM", str(Time("1:49 AM")))
+        self.assertEqual("02:15 AM", str(Time("02:15 AM")))
+        self.assertEqual("12:00 PM", str(Time("12:00 PM")))
+        self.assertEqual("6:30 PM", str(Time("6:30 PM")))
+        self.assertEqual("9:45 PM", str(Time("9:45 PM")))
+        self.assertEqual("00:00 AM", str(Time("00:00 AM")))
+        self.assertEqual("12:00 AM", str(Time("12:00 AM")))
+        self.assertEqual("13:30", str(Time("13:30")))
+        self.assertEqual("9:45", str(Time("9:45")))
+
 
 class TestDatedEntry(TestCase):
     def test_bare_minimum_dated_entries(self):
@@ -53,11 +114,76 @@ def test_bare_minimum_dated_entries(self):
         )
 
         # Then
-        self.assertTrue(bare_minimum_dated_entry.mood, "vaguely ok")
-        self.assertTrue(bare_minimum_dated_entry.uid, "1:49 AM")
+        self.assertEqual("vaguely ok", bare_minimum_dated_entry.mood)
+        self.assertEqual("1:49 AM", str(bare_minimum_dated_entry.uid))
         self.assertIsNone(bare_minimum_dated_entry.title)
         self.assertIsNone(bare_minimum_dated_entry.note)
-        self.assertListEqual(bare_minimum_dated_entry.activities, [])
+        self.assertListEqual([], bare_minimum_dated_entry.activities)
+
+    def test_other_variants_of_dated_entries(self):
+        # When
+        entry = DatedEntry(
+            time="1:49 AM",
+            mood="vaguely ok",
+            title="Normal situation"
+        )
+
+        # Then
+        self.assertEqual("vaguely ok", entry.mood)
+        self.assertEqual("1:49 AM", str(entry.uid))
+        self.assertEqual("Normal situation", entry.title)
+        self.assertIsNone(entry.note)
+        self.assertListEqual([], entry.activities)
+
+        # When
+        entry = DatedEntry(
+            time="1:49 AM",
+            mood="vaguely ok",
+            title="Normal situation",
+            note="A completely normal situation just occurred."
+        )
+
+        # Then
+        self.assertEqual("vaguely ok", entry.mood)
+        self.assertEqual("1:49 AM", str(entry.uid))
+        self.assertEqual("Normal situation", entry.title)
+        self.assertEqual("A completely normal situation just occurred.", entry.note)
+        self.assertListEqual([], entry.activities)
+
+        # When
+        options.tag_activities = True
+        entry = DatedEntry(
+            time="1:49 AM",
+            mood="vaguely ok",
+            title="Normal situation",
+            note="A completely normal situation just occurred.",
+            activities="bicycle|chess|gaming"
+        )
+
+        # Then
+        self.assertEqual("vaguely ok", entry.mood)
+        self.assertEqual("1:49 AM", str(entry.uid))
+        self.assertEqual("Normal situation", entry.title)
+        self.assertEqual("A completely normal situation just occurred.", entry.note)
+        self.assertListEqual(["#bicycle", "#chess", "#gaming"], entry.activities)
+
+        # When
+        options.tag_activities = False
+        entry = DatedEntry(
+            time="1:49 AM",
+            mood="vaguely ok",
+            title="Normal situation",
+            note="A completely normal situation just occurred.",
+            activities="bicycle|chess|gaming"
+        )
+
+        # Then
+        self.assertEqual("vaguely ok", entry.mood)
+        self.assertEqual("1:49 AM", str(entry.uid))
+        self.assertEqual("Normal situation", entry.title)
+        self.assertEqual("A completely normal situation just occurred.", entry.note)
+        self.assertListEqual(["bicycle", "chess", "gaming"], entry.activities)
 
     def test_insufficient_dated_entries(self):
         self.assertRaises(ValueError, DatedEntry, time="2:00", mood="")
+        self.assertRaises(ValueError, DatedEntry, time=":00", mood="vaguely ok")
diff --git a/_tests/test_librarian.py b/_tests/test_librarian.py
index 04e7818..f974538 100644
--- a/_tests/test_librarian.py
+++ b/_tests/test_librarian.py
@@ -2,6 +2,7 @@
 
 from src import librarian
 from src.librarian import Librarian
+from src.config import options
 
 
 class TestLibrarian(TestCase):
@@ -11,19 +12,19 @@ class TestLibrarian(TestCase):
     We use internal class methods to check proper handling of data throughout the process.
     """
     def test_init_valid_csv(self):
-        self.assertTrue(Librarian("_tests/sheet-1-valid-data.csv"))
+        self.assertTrue(Librarian("_tests/files/journal_CSVs/sheet-1-valid-data.csv"))
 
     def test_init_invalid_csv(self):
         """
         Pass faulty files and see if it fails as expected.
         """
-        self.assertRaises(librarian.CannotAccessFileError, Librarian, "_tests/sheet-2-corrupted-bytes.csv")
-        self.assertRaises(librarian.CannotAccessFileError, Librarian, "_tests/sheet-3-wrong-format.txt")
-        self.assertRaises(librarian.CannotAccessFileError, Librarian, "_tests/sheet-4-no-extension")
-        self.assertRaises(librarian.CannotAccessFileError, Librarian, "_tests/sheet-5-missing-file.csv")
+        self.assertRaises(librarian.CannotAccessFileError, Librarian, "_tests/files/journal_CSVs/sheet-2-corrupted-bytes.csv")
+        self.assertRaises(librarian.CannotAccessFileError, Librarian, "_tests/files/journal_CSVs/sheet-3-wrong-format.txt")
+        self.assertRaises(librarian.CannotAccessFileError, Librarian, "_tests/files/journal_CSVs/sheet-4-no-extension")
+        self.assertRaises(librarian.CannotAccessFileError, Librarian, "_tests/files/journal_CSVs/sheet-5-missing-file.csv")
 
         # TODO: handle this case in Librarian
-        # self.assertRaises(librarian.CannotAccessFileError, Librarian, "_tests/sheet-6-empty-file.csv")
+        # self.assertRaises(librarian.CannotAccessFileError, Librarian, "_tests/files/journal_CSVs/sheet-6-empty-file.csv")
 
         # TODO: maybe generate corrupted_sheet and wrong_format during runner setup in workflow mode?
         # dd if=/dev/urandom of="$corrupted_file" bs=1024 count=10
@@ -34,11 +35,11 @@ def test_init_invalid_csv(self):
 
     def test_valid_access_dates(self):
         """
-        All the following dates exist in the _tests/sheet-1-valid-data.csv and should be accessible by ``lib``.
+        All the following dates exist in the _tests/files/journal_CSVs/sheet-1-valid-data.csv and should be accessible by ``lib``.
         """
         # When
         lib = Librarian(
-            path_to_file="_tests/sheet-1-valid-data.csv",
+            path_to_file="_tests/files/journal_CSVs/sheet-1-valid-data.csv",
             path_to_moods="moods.json"
         )
 
@@ -56,11 +57,11 @@ def test_valid_access_dates(self):
 
     def test_wrong_access_dates(self):
         """
-        **None** of the following dates exist in the _tests/sheet-1-valid-data.csv and should **NOT** be accessible by ``lib``.
+        **None** of the following dates exist in the _tests/files/journal_CSVs/sheet-1-valid-data.csv and should **NOT** be accessible by ``lib``.
         """
         # When
         lib = Librarian(
-            path_to_file="_tests/sheet-1-valid-data.csv",
+            path_to_file="_tests/files/journal_CSVs/sheet-1-valid-data.csv",
             path_to_moods="moods.json"
         )
 
@@ -90,38 +91,41 @@ def test_wrong_access_dates(self):
     def test_custom_moods_when_passed_correctly(self):
         """Pass a valid JSON file and see if it knows it has access to custom moods now."""
         self.assertTrue(Librarian(
-            path_to_file="_tests/sheet-1-valid-data.csv",
+            path_to_file="_tests/files/journal_CSVs/sheet-1-valid-data.csv",
             path_to_moods="moods.json"
         ).current_mood_set.has_custom_moods)
 
     def test_custom_moods_when_not_passed(self):
         """Pass no moods and see if it know it only has standard moods available."""
         self.assertFalse(Librarian(
-            path_to_file="_tests/sheet-1-valid-data.csv"
+            path_to_file="_tests/files/journal_CSVs/sheet-1-valid-data.csv"
         ).current_mood_set.has_custom_moods)
 
     def test_custom_moods_with_invalid_jsons(self):
         """Pass faulty moods and see if it fails as expected."""
         self.assertRaises(
             librarian.CannotAccessCustomMoodsError,
-            Librarian, "_tests/sheet-1-valid-data.csv", "_tests/output-results/", "_tests/empty_sheet.csv"
+            Librarian,
+            "_tests/files/journal_CSVs/sheet-1-valid-data.csv",
+            "_tests/files/output-results/",
+            "_tests/files/empty_sheet.csv"
         )
 
     def test_custom_moods_when_json_invalid(self):
         self.assertRaises(librarian.CannotAccessCustomMoodsError,
                           Librarian,
-                          "_tests/sheet-1-valid-data.csv",
-                          "_tests/output-results/",
+                          "_tests/files/journal_CSVs/sheet-1-valid-data.csv",
+                          "_tests/files/output-results/",
                           "_tests/empty_sheet.csv")
         self.assertRaises(librarian.CannotAccessCustomMoodsError,
                           Librarian,
-                          "_tests/sheet-1-valid-data.csv",
-                          "_tests/output-results/",
+                          "_tests/files/journal_CSVs/sheet-1-valid-data.csv",
+                          "_tests/files/output-results/",
                           "_tests/missing-file.json")
         self.assertRaises(librarian.CannotAccessCustomMoodsError,
                           Librarian,
-                          "_tests/sheet-1-valid-data.csv",
-                          "_tests/output-results/",
+                          "_tests/files/journal_CSVs/sheet-1-valid-data.csv",
+                          "_tests/files/output-results/",
                           "_tests/locked-dir/locked_file.csv")
 
     def test_custom_moods_that_are_incomplete(self):
@@ -130,9 +134,10 @@ def test_custom_moods_that_are_incomplete(self):
         However, it can only expand it (and be truthy) if the dict with moods has all required groups.
         Therefore, since ``incomplete-moods`` lacks the ``good`` group, the assertion will evaluate to False.
         """
+        options.tag_activities = True
         lib_to_test = Librarian(
-            "_tests/sheet-1-valid-data.csv",
-            "_tests/output-results/",
-            "_tests/incomplete-moods.json"
+            "_tests/files/journal_CSVs/sheet-1-valid-data.csv",
+            "_tests/files/output-results/",
+            "_tests/files/mood_JSONs/incomplete-moods.json"
         )
         self.assertFalse(lib_to_test.current_mood_set.has_custom_moods)
diff --git a/_tests/test_mood.py b/_tests/test_mood.py
index 1e28aac..01f00f7 100644
--- a/_tests/test_mood.py
+++ b/_tests/test_mood.py
@@ -16,24 +16,24 @@ def test_default_moodverse_no_customisation(self):
         self.assertTrue(isinstance(my_default_moodverse["bad"], MoodGroup))
         self.assertTrue(isinstance(my_default_moodverse["awful"], MoodGroup))
 
-        self.assertEqual(my_default_moodverse["rad"], ["rad"])
-        self.assertEqual(my_default_moodverse["good"], ["good"])
-        self.assertEqual(my_default_moodverse["neutral"], ["neutral"])
-        self.assertEqual(my_default_moodverse["bad"], ["bad"])
-        self.assertEqual(my_default_moodverse["awful"], ["awful"])
+        self.assertEqual(["rad"], my_default_moodverse["rad"])
+        self.assertEqual(["good"], my_default_moodverse["good"])
+        self.assertEqual(["neutral"], my_default_moodverse["neutral"])
+        self.assertEqual(["bad"], my_default_moodverse["bad"])
+        self.assertEqual(["awful"], my_default_moodverse["awful"])
 
         # this is just so I can test whether my __eq__ function overload correctly skips this
         self.assertNotEqual(my_default_moodverse["awful"], MoodGroup("awful"))
 
         # These comparisons should be falsy because the array has more moods than the default mood set initialised
-        self.assertNotEqual(my_default_moodverse["rad"], ["rad", "amazing"])
-        self.assertNotEqual(my_default_moodverse["awful"], ["awful", "miserable"])
+        self.assertNotEqual(["rad", "amazing"], my_default_moodverse["rad"])
+        self.assertNotEqual(["awful", "miserable"], my_default_moodverse["awful"])
 
         # This comparison should be falsy because it does not contain the default mood set initialised
         # └── known moods of 'neutral' group
         #     └── neutral <-- from standard
         # And we're basically saying, "In neutral group there should only be a 'meh' mood"
-        self.assertNotEqual(my_default_moodverse["neutral"], ["meh"])
+        self.assertNotEqual(["meh"], my_default_moodverse["neutral"])
 
     def test_loading_valid_moods_into_moodverse(self):
         # These moods are self-sufficient, because even if standard mood set didn't exist, they satisfy all requirements
@@ -56,11 +56,11 @@ def test_loading_valid_moods_into_moodverse(self):
         self.assertTrue(isinstance(my_moodverse["bad"], MoodGroup))
         self.assertTrue(isinstance(my_moodverse["awful"], MoodGroup))
 
-        self.assertEqual(my_moodverse["rad"], ["rad", "amazing"])
-        self.assertEqual(my_moodverse["good"], ["good", "nice"])
-        self.assertEqual(my_moodverse["neutral"], ["neutral", "ok", "fine"])
-        self.assertEqual(my_moodverse["bad"], ["bad"])
-        self.assertEqual(my_moodverse["awful"], ["awful", "miserable"])
+        self.assertEqual(["rad", "amazing"], my_moodverse["rad"])
+        self.assertEqual(["good", "nice"], my_moodverse["good"])
+        self.assertEqual(["neutral", "ok", "fine"], my_moodverse["neutral"])
+        self.assertEqual(["bad"], my_moodverse["bad"])
+        self.assertEqual(["awful", "miserable"], my_moodverse["awful"])
 
     def test_loading_semi_valid_moods_into_moodverse(self):
         # This mood set isn't self-sufficient, but still valid, because it has all the required "groups".
@@ -105,18 +105,18 @@ def test_loading_semi_valid_moods_into_moodverse(self):
         self.assertTrue(isinstance(my_moodverse["awful"], MoodGroup))
 
         # responses should be identical to the ones in previous test, because standard mood filled the blanks
-        self.assertEqual(my_moodverse["rad"], ["rad", "amazing"])
-        self.assertEqual(my_moodverse["good"], ["good", "nice"])
-        self.assertEqual(my_moodverse["neutral"], ["neutral", "ok", "fine"])
-        self.assertEqual(my_moodverse["bad"], ["bad"])
-        self.assertEqual(my_moodverse["awful"], ["awful", "miserable"])
+        self.assertEqual(["rad", "amazing"], my_moodverse["rad"])
+        self.assertEqual(["good", "nice"], my_moodverse["good"])
+        self.assertEqual(["neutral", "ok", "fine"], my_moodverse["neutral"])
+        self.assertEqual(["bad"], my_moodverse["bad"])
+        self.assertEqual(["awful", "miserable"], my_moodverse["awful"])
 
         # let's shuffle the order of values around to check if both lists are still equal
-        self.assertEqual(my_moodverse["rad"], ["amazing", "rad"])
-        self.assertEqual(my_moodverse["good"], ["nice", "good"])
-        self.assertEqual(my_moodverse["neutral"], ["ok", "neutral", "fine"])
-        self.assertEqual(my_moodverse["bad"], ["bad"])
-        self.assertEqual(my_moodverse["awful"], ["miserable", "awful"])
+        self.assertEqual(["amazing", "rad"], my_moodverse["rad"])
+        self.assertEqual(["nice", "good"], my_moodverse["good"])
+        self.assertEqual(["ok", "neutral", "fine"], my_moodverse["neutral"])
+        self.assertEqual(["bad"], my_moodverse["bad"])
+        self.assertEqual(["miserable", "awful"], my_moodverse["awful"])
 
     def test_get_mood(self):
         # These moods are self-sufficient, because even if standard mood set didn't exist, they satisfy all requirements
@@ -210,8 +210,8 @@ def test_create_mood_in_this_group(self):
         # Check if they exist
 
         # checks __eq__ overload - obj(group_name) == str(group_name)
-        self.assertEqual(my_fancy_group["fancy"], "fancy")
-        self.assertEqual(my_fancy_group["out of this world"], "out of this world")
+        self.assertEqual("fancy", my_fancy_group["fancy"])
+        self.assertEqual("out of this world", my_fancy_group["out of this world"])
 
         # also checks __getitem__ - obj(group_name)[group_name]: List[mood: str]
-        self.assertSetEqual(set(my_fancy_group.known_moods), {"out of this world", "fancy"})
+        self.assertSetEqual({"out of this world", "fancy"}, set(my_fancy_group.known_moods))
diff --git a/_tests/test_output.py b/_tests/test_output.py
index 0642c0b..2dc9af6 100644
--- a/_tests/test_output.py
+++ b/_tests/test_output.py
@@ -44,7 +44,7 @@ def test_bare_minimum_entry_content(self):
                 # ---
                 # getvalue() returns the entire stream content regardless of current stream position, read() does not.
                 # https://stackoverflow.com/a/53485819
-                self.assertEqual(my_fake_file_stream.getvalue(), compare_stream.getvalue())
+                self.assertEqual(compare_stream.getvalue(), my_fake_file_stream.getvalue())
 
     def test_entry_with_title_no_note(self):
         """
@@ -71,7 +71,7 @@ def test_entry_with_title_no_note(self):
 
                 # THEN
                 # ---
-                self.assertEqual(my_fake_file_stream.getvalue(), compare_stream.getvalue())
+                self.assertEqual(compare_stream.getvalue(), my_fake_file_stream.getvalue())
 
     def test_entry_with_title_and_note(self):
         """
@@ -102,7 +102,7 @@ def test_entry_with_title_and_note(self):
 
                 # THEN
                 # ---
-                self.assertEqual(my_fake_file_stream.getvalue(), compare_stream.getvalue())
+                self.assertEqual(compare_stream.getvalue(), my_fake_file_stream.getvalue())
 
     def test_entry_with_hashtagged_activities(self):
         """
@@ -129,7 +129,7 @@ def test_entry_with_hashtagged_activities(self):
 
                 # THEN
                 # ---
-                self.assertEqual(my_fake_file_stream.getvalue(), compare_stream.getvalue())
+                self.assertEqual(compare_stream.getvalue(), my_fake_file_stream.getvalue())
 
         # WHEN
         # ---
@@ -148,7 +148,7 @@ def test_entry_with_hashtagged_activities(self):
 
                 # THEN
                 # ---
-                self.assertEqual(my_fake_file_stream.getvalue(), compare_stream.getvalue())
+                self.assertEqual(compare_stream.getvalue(), my_fake_file_stream.getvalue())
 
 
 class TestDatedEntriesGroup(TestCase):
@@ -179,7 +179,7 @@ def test_outputting_day_with_one_entry(self):
 
                 # THEN
                 # ---
-                self.assertEqual(my_fake_file_stream.getvalue(), compare_stream.getvalue())
+                self.assertEqual(compare_stream.getvalue(), my_fake_file_stream.getvalue())
 
     def test_outputting_day_with_two_entries(self):
         """
@@ -219,7 +219,7 @@ def test_outputting_day_with_two_entries(self):
 
                 # THEN
                 # ---
-                self.assertEqual(my_fake_file_stream.getvalue(), compare_stream.getvalue())
+                self.assertEqual(compare_stream.getvalue(), my_fake_file_stream.getvalue())
 
     def test_outputting_day_with_two_entries_and_invalid_filetags(self):
         """
@@ -259,7 +259,7 @@ def test_outputting_day_with_two_entries_and_invalid_filetags(self):
 
                 # THEN
                 # ---
-                self.assertEqual(my_fake_file_stream.getvalue(), compare_stream.getvalue())
+                self.assertEqual(compare_stream.getvalue(), my_fake_file_stream.getvalue())
 
     def test_outputting_day_with_two_entries_and_partially_valid_filetags(self):
         """
@@ -303,7 +303,7 @@ def test_outputting_day_with_two_entries_and_partially_valid_filetags(self):
 
                 # THEN
                 # ---
-                self.assertEqual(my_fake_file_stream.getvalue(), compare_stream.getvalue())
+                self.assertEqual(compare_stream.getvalue(), my_fake_file_stream.getvalue())
 
 
 class TestOutputFileStructure(TestCase):
@@ -318,27 +318,27 @@ def test_directory_loop(self):
         """
         options.tags = ["daily"]
 
-        lib = Librarian("_tests/sheet-1-valid-data.csv", path_to_output="_tests/output-results")
+        lib = Librarian("_tests/files/journal_CSVs/sheet-1-valid-data.csv", path_to_output="_tests/files/output-results")
         lib.output_all()
 
-        with open("_tests/output-results/2022/10/2022-10-25.md", encoding="UTF-8") as parsed_result:
-            with open("_tests/expected_results/2022-10-25.md", encoding="UTF-8") as expected_result:
-                self.assertListEqual(parsed_result.readlines(), expected_result.readlines())
+        with open("_tests/files/output-results/2022/10/2022-10-25.md", encoding="UTF-8") as parsed_result:
+            with open("_tests/files/expected_results/2022-10-25.md", encoding="UTF-8") as expected_result:
+                self.assertListEqual(expected_result.readlines(), parsed_result.readlines())
 
-        with open("_tests/output-results/2022/10/2022-10-26.md", encoding="UTF-8") as parsed_result:
-            with open("_tests/expected_results/2022-10-26.md", encoding="UTF-8") as expected_result:
-                self.assertListEqual(parsed_result.readlines(), expected_result.readlines())
+        with open("_tests/files/output-results/2022/10/2022-10-26.md", encoding="UTF-8") as parsed_result:
+            with open("_tests/files/expected_results/2022-10-26.md", encoding="UTF-8") as expected_result:
+                self.assertListEqual(expected_result.readlines(), parsed_result.readlines())
 
-        with open("_tests/output-results/2022/10/2022-10-27.md", encoding="UTF-8") as parsed_result:
-            with open("_tests/expected_results/2022-10-27.md", encoding="UTF-8") as expected_result:
-                self.assertListEqual(parsed_result.readlines(), expected_result.readlines())
+        with open("_tests/files/output-results/2022/10/2022-10-27.md", encoding="UTF-8") as parsed_result:
+            with open("_tests/files/expected_results/2022-10-27.md", encoding="UTF-8") as expected_result:
+                self.assertListEqual(expected_result.readlines(), parsed_result.readlines())
 
-        with open("_tests/output-results/2022/10/2022-10-30.md", encoding="UTF-8") as parsed_result:
-            with open("_tests/expected_results/2022-10-30.md", encoding="UTF-8") as expected_result:
-                self.assertListEqual(parsed_result.readlines(), expected_result.readlines())
+        with open("_tests/files/output-results/2022/10/2022-10-30.md", encoding="UTF-8") as parsed_result:
+            with open("_tests/files/expected_results/2022-10-30.md", encoding="UTF-8") as expected_result:
+                self.assertListEqual(expected_result.readlines(), parsed_result.readlines())
 
     def tearDown(self) -> None:
-        folder = '_tests/output-results'
+        folder = '_tests/files/output-results'
         for filename in os.listdir(folder):
             file_path = os.path.join(folder, filename)
             try:
diff --git a/_tests/test_utils.py b/_tests/test_utils.py
index 686c70a..c1811ba 100644
--- a/_tests/test_utils.py
+++ b/_tests/test_utils.py
@@ -8,12 +8,12 @@ class TestUtils(TestCase):
     def test_slugify(self):
         # no need to check if slug is a valid tag
         # noinspection SpellCheckingInspection
-        self.assertEqual(utils.slugify("ConvertThis to-------a SLUG", False), "convertthis-to-a-slug")
+        self.assertEqual("convertthis-to-a-slug", utils.slugify("ConvertThis to-------a SLUG", False))
         # noinspection SpellCheckingInspection
-        self.assertEqual(utils.slugify("Zażółć gęślą jaźń    ", False), "zażółć-gęślą-jaźń")
-        self.assertEqual(utils.slugify("  Multiple   spaces  between    words", False), "multiple-spaces-between-words")
+        self.assertEqual("zażółć-gęślą-jaźń", utils.slugify("Zażółć gęślą jaźń    ", False))
+        self.assertEqual("multiple-spaces-between-words", utils.slugify("  Multiple   spaces  between    words", False))
         # noinspection SpellCheckingInspection
-        self.assertEqual(utils.slugify("Хлеба нашего повшеднего", False), "хлеба-нашего-повшеднего")
+        self.assertEqual("хлеба-нашего-повшеднего", utils.slugify("Хлеба нашего повшеднего", False))
 
         # check if the slug is a valid tag
         with self.assertLogs(logging.getLogger("src.utils"), logging.WARNING):
@@ -30,3 +30,12 @@ def test_expand_path(self):
         self.assertFalse(utils.expand_path("$HOME/whatever").startswith("$HOME"))
         # noinspection SpellCheckingInspection
         self.assertFalse(utils.expand_path('~/yes').startswith('~'))
+
+    def test_strip_and_get_truthy(self):
+        self.assertListEqual(["one", "two"], utils.strip_and_get_truthy("\"one||two|||||\"", "|"))
+        self.assertListEqual([], utils.strip_and_get_truthy("\"\"", "|"))
+
+    def test_slice_quotes(self):
+        self.assertEqual("test", utils.slice_quotes("\"test\""))
+        self.assertIsNone(utils.slice_quotes("\"\""))
+        self.assertEqual("bicycle", utils.slice_quotes("\" bicycle   \""))
diff --git a/src/dated_entry.py b/src/dated_entry.py
index 255fb58..c87a503 100644
--- a/src/dated_entry.py
+++ b/src/dated_entry.py
@@ -68,7 +68,10 @@
 
 
 class IsNotTimeError(utils.CustomException):
-    """Expected a string in a valid time format - HH:MM with optional AM/PM suffix."""
+    msg = "Expected HH:MM (+ optionally AM/PM suffix) but got {} instead."
+
+    def __init__(self, tried_time: str):
+        super().__init__(type(self).msg.format(tried_time))
 
 
 def is_time_format_valid(string: str) -> Match[str] | None:
@@ -100,18 +103,6 @@ def is_time_range_valid(string: str) -> bool:
     return all((is_hour_ok, is_minutes_ok))
 
 
-def slice_quotes(string: str) -> str:
-    """
-    Gets rid of initial and terminating quotation marks inserted by Daylio
-    :param string: string to be sliced
-    :returns: string without quotation marks in the beginning and end of the initial string, even if it means empty str.
-    """
-    if string is not None and len(string) > 2:
-        return string.strip("\"").strip()
-    # only 2 characters? Then it is an empty cell.
-    return ""
-
-
 class ErrorMsg(errors.ErrorMsgBase):
     INVALID_MOOD = "Mood {} is missing from a list of known moods. Not critical, but colouring won't work on the entry."
     WRONG_TIME = "Received {}, expected valid time. Cannot create this entry without a valid time."
@@ -137,16 +128,15 @@ def __init__(self, string: str):
         self.__logger = logging.getLogger(self.__class__.__name__)
 
         # OK
-        if is_time_format_valid(string) and is_time_range_valid(string):
+        if is_time_format_valid(string.strip()) and is_time_range_valid(string.strip()):
             time_array = string.strip().split(':')
             self.__hour = time_array[0]
             self.__minutes = time_array[1]
 
         # NOT OK
         else:
-            msg_on_error = ErrorMsg.print(ErrorMsg.WRONG_VALUE, string, "HH:MM (AM/PM/)")
-            self.__logger.warning(msg_on_error)
-            raise IsNotTimeError(msg_on_error)
+            self.__logger.warning(IsNotTimeError.msg.format(string))
+            raise IsNotTimeError(string)
 
     def __str__(self) -> str:
         """
@@ -188,7 +178,7 @@ def __init__(self,
         :param override_mood_set: Set if you want to use custom :class:`Moodverse` for mood handling
         """
         # TODO: have to test the whole instantiation function again after refactoring
-        # self.__logger = logging.getLogger(self.__class__.__name__)
+        self.__logger = logging.getLogger(self.__class__.__name__)
 
         # Processing required properties
         # ---
@@ -203,7 +193,7 @@ def __init__(self,
         # ---
         # MOOD
         # ---
-        if len(mood) == 0:
+        if not mood:
             raise ValueError
         # Check if the mood is valid - i.e. it does exist in the currently used Moodverse
         if not override_mood_set.get_mood(mood):
@@ -215,34 +205,28 @@ def __init__(self,
         # ---
         # Process activities
         # ---
-        # TODO: I could make a decouple_and_sanitise() func to strip() and slice the string into a valid array
         self.__activities = []
-        # empty string "" is unfortunately still a valid element of array which makes it truthy
-        # I use list comprehension to discard such falsy values from the temporary array
-        array = [activity for activity in slice_quotes(activities).split(options.csv_delimiter) if activity]
-        if len(array) > 0:
-            for activity in array:
-                self.__activities.append(utils.slugify(
-                    activity,
-                    options.tag_activities
-                ))
-        else:
-            errors.ErrorMsgBase.print(ErrorMsg.WRONG_ACTIVITIES)
+        if activities:
+            working_array = utils.strip_and_get_truthy(activities, options.csv_delimiter)
+            if len(working_array) > 0:
+                for activity in working_array:
+                    self.__activities.append(utils.slugify(
+                        activity,
+                        options.tag_activities
+                    ))
+            else:
+                errors.ErrorMsgBase.print(ErrorMsg.WRONG_ACTIVITIES)
         # ---
         # Process title
         # ---
-        self.__title = None
-        if title:
-            self.__title = slice_quotes(title)
-        else:
+        self.__title = utils.slice_quotes(title) if title else None
+        if not title:
             errors.ErrorMsgBase.print(ErrorMsg.WRONG_TITLE)
         # ---
         # Process note
         # ---
-        self.__note = None
-        if note:
-            self.__note = slice_quotes(note)
-        else:
+        self.__note = utils.slice_quotes(note) if note else None
+        if not note:
             errors.ErrorMsgBase.print(ErrorMsg.WRONG_NOTE)
 
     def output(self, stream: io.IOBase | typing.IO) -> int:
diff --git a/src/entry/mood.py b/src/entry/mood.py
index 055e2e8..7ec319c 100644
--- a/src/entry/mood.py
+++ b/src/entry/mood.py
@@ -2,6 +2,7 @@
 
 import logging
 from typing import List, Optional
+
 from src import errors
 from src import utils
 
@@ -26,7 +27,6 @@ class Moodverse:
     Moodverse is the single source of truth regarding moods. It always knows the bare-minimum set of moods.
     Its knowledge can be expanded with custom mood sets.
     """
-
     def __init__(self, moods_to_process: dict[str, List[str]] = None):
         """
         If you want to expand the standard mood set with your custom one, make sure to pass a valid mood set file.
@@ -98,7 +98,7 @@ def __expand_moodset_with_customs(self, moods_to_process: dict[str, List[str]])
         # The side effect is that keys in the passed dictionary which do not appear in standard mood set are skipped
 
         # e.g. I'm expecting a "rad" group to be in the dict
-        for expected_mood_group in self.__mood_set:
+        for expected_mood_group in self.__mood_set.keys():
             expected_mood_group: str
             try:
                 # Leap of faith - there must be a "rad" group, otherwise there's no point in continuing
@@ -136,7 +136,6 @@ class AbstractMood:
     """
     Provides shared methods for :class:`MoodGroup` and :class:`Mood`.
     """
-
     def __init__(self, value):
         if not value or isinstance(value, str) is False:
             raise ValueError
@@ -166,7 +165,6 @@ class MoodGroup(AbstractMood):
 
     Daylio uses 'rad', 'great', 'neutral', 'bad' & 'awful'.
     """
-
     def __init__(self, name_of_the_mood_group: str):
         """
         Create a :class:`MoodGroup` object with the specified name.
@@ -177,7 +175,7 @@ def __init__(self, name_of_the_mood_group: str):
 
         super().__init__(name_of_the_mood_group)
 
-    def create_mood(self, name: str = None):
+    def create_mood(self, name: str = None) -> 'Mood':
         """
         Create the specified mood and append its reference to the known moods in this group.
         :param name: Name of the mood. If none provided, use the mood group name as its name (e.g. rad group -> rad).
@@ -190,9 +188,12 @@ def create_mood(self, name: str = None):
         final_name = self.name if name is None else name
         try:
             ref = Mood(final_name)
-            self.__known_moods[final_name] = ref
         except (EmptyValue, ValueError):
             self.__logger.warning(ErrorMsg.print(ErrorMsg.SKIPPED_INVALID_MOOD, final_name))
+        # all went ok
+        else:
+            self.__known_moods[final_name] = ref
+            return ref
 
     # TODO: possibly could do funky stuff with multiple inheritance - this method could come from Moodverse
     @property
@@ -226,7 +227,7 @@ def __eq__(self, other: List[str]) -> bool:
         if isinstance(other, list) and all(isinstance(item, str) for item in other):
             # I'm not sure why, but set() instead of pure array makes sure that the order is irrelevant
             # therefore ["nice", "good"] == ["good", "nice"] is Truthy, as expected
-            return {str(obj) for obj in self.known_moods} == set(other)
+            return set([str(obj) for obj in self.known_moods]) == set(other)
         # Call the superclass' __eq__ for any other comparison
         return super().__eq__(other)
 
@@ -240,3 +241,5 @@ class Mood(AbstractMood):
     - rad is a mood. It belongs to rad group.
     - awesome is a mood. It also belongs to the rad group.
     - hungry is a mood. It belongs either to neutral, bad or awful mood groups, depending on user preferences I guess"""
+    def __init__(self, value: str):
+        super().__init__(value)
diff --git a/src/errors.py b/src/errors.py
index 188bf81..8b8e82b 100644
--- a/src/errors.py
+++ b/src/errors.py
@@ -65,7 +65,7 @@ def print(message: str, *args: str) -> Optional[str]:
 
         if len(args) != expected_args:
             logging.getLogger(__name__).warning(
-                "Expected %s arguments for \"%s\", but got %s instead.", expected_args, message, len(args)
+                f"Expected {expected_args} arguments for \"{message}\", but got {len(args)} instead."
             )
             return None
         return message.format(*args)
diff --git a/src/librarian.py b/src/librarian.py
index 5eb94d2..a10146b 100644
--- a/src/librarian.py
+++ b/src/librarian.py
@@ -340,10 +340,10 @@ def access_date(self, target_date: str) -> DatedEntriesGroup:
 
         if str(date_lookup) in self.__known_dates:
             return self.__known_dates[str(date_lookup)]
-
-        new_obj = DatedEntriesGroup(str(date_lookup), self.__mood_set)
-        self.__known_dates[str(date_lookup)] = new_obj
-        return new_obj
+        else:
+            new_obj = DatedEntriesGroup(str(date_lookup), self.__mood_set)
+            self.__known_dates[str(date_lookup)] = new_obj
+            return new_obj
 
     def output_all(self):
         """
diff --git a/src/utils.py b/src/utils.py
index 1173715..ef4eeb7 100755
--- a/src/utils.py
+++ b/src/utils.py
@@ -4,6 +4,7 @@
 import logging
 import os
 import re
+from typing import Any, List
 
 from src import errors
 
@@ -40,7 +41,7 @@ class StreamError(CustomException):
     pass
 
 
-def slugify(text: str, taggify: bool):
+def slugify(text: str, taggify: bool) -> str:
     # noinspection SpellCheckingInspection
     """
     Simple slugification function to transform text. Works on non-latin characters too.
@@ -59,7 +60,7 @@ def slugify(text: str, taggify: bool):
     return '#' + text if taggify else text
 
 
-def expand_path(path):
+def expand_path(path: str) -> str:
     """
     Expand all %variables%, ~/home-directories and relative parts in the path. Return the expanded path.
     It does not use os.path.abspath() because it treats current script directory as root.
@@ -71,3 +72,29 @@ def expand_path(path):
             os.path.expandvars(path)
         )
     )
+
+
+def slice_quotes(string: str) -> str | None:
+    """
+    Gets rid of initial and terminating quotation marks inserted by Daylio
+    :param string: string to be sliced
+    :returns: string without quotation marks in the beginning and end of the initial string, or nothing if "" provided.
+    """
+    # only 2 characters? Then it is an empty cell, because Daylio wraps its values inside "" like so: "","","",""...
+    return string.strip("\"").strip() if string and len(string) > 2 else None
+
+
+def strip_and_get_truthy(delimited_string: str, delimiter: str) -> List[str]:
+    """
+    Pipe delimited strings may result in arrays that contain zero-length strings.
+    While such strings in itself are falsy, any array that has them is automatically truthy, unfortunately.
+    Therefore, I use list comprehension to discard such falsy values from an array and return the sanitised array.
+    :returns: array without falsy values, even if it results in empty (falsy) array
+    """
+    # I need to separate returning into the guard statement and actual return because slice_quotes can produce null vals
+    if delimited_string is None:
+        return []
+
+    sliced_del_string = slice_quotes(delimited_string)
+
+    return [el for el in sliced_del_string.split(delimiter) if el] if sliced_del_string else []