diff --git a/data/jorts.metainfo.xml.in.in b/data/jorts.metainfo.xml.in.in
index ffeef0de..04b3960b 100644
--- a/data/jorts.metainfo.xml.in.in
+++ b/data/jorts.metainfo.xml.in.in
@@ -9,7 +9,7 @@
     <name>Jorts</name>
     <summary>Write on colourful little squares</summary>
     <description>
-        <p>Neither jeans nor shorts, just like jorts!</p>
+        <p>Neither jeans nor shorts, just like jorts! A thoughtful little sticky notes application, to display any sort of short term information on your screen.</p>
         <p>Features include:</p>
         <ul>
             <li>Colourful: Eleven pretty pastel themes</li>
@@ -92,7 +92,7 @@
     </screenshots>
 
     <releases>
-        <release version="4.3.0" date="2026-06-31">
+        <release version="4.3.0" date="2026-07-10">
             <description>
                 <p>A lot of tiny goodies</p>
                 <ul>
@@ -140,7 +140,7 @@
                 <ul>
                     <li>From ellie-commons to elly-code</li>
                 </ul>
-                <p>😎 Guests stars:</p>
+                <p>Guests stars: 😎</p>
                 <ul>
                     <li>Updated sv-SE translation thanks to @yeager!</li>
                     <li>Added vietnamese translation thanks to @hthienloc!</li>
@@ -152,7 +152,7 @@
         </release>
         <release version="4.0.0" date="2025-11-22">
             <description>
-                <p>🚀 4.0.0 Jorts of Hyperspace!</p>
+                <p>4.0.0 Jorts of Hyperspace! 🚀</p>
                 <ul>
                     <li>Version 4 to align with Gtk version</li>
                     <li>Added button to toggle lists, and ability to customize them</li>
@@ -162,7 +162,7 @@
                     <li>A couple visual bugfixes as well!</li>
                     <li>Various under the hood performance improvements</li>
                 </ul>
-                <p>😎 Guests stars:</p>
+                <p>Guests stars: 😎</p>
                 <ul>
                     <li>Updated JA translation thanks to @ryonakano!</li>
                     <li>You, the user, for liking this lil app!</li>
diff --git a/data/meson.build b/data/meson.build
index 7839116d..b39cf176 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -49,10 +49,6 @@ install_data(
     install_dir: get_option('datadir') / 'glib-2.0' / 'schemas',
 )
 
-compile_schemas = find_program('glib-compile-schemas', native: true, required: false)
-if compile_schemas.found()
-    test('Validate schema file', compile_schemas, args: ['--strict', '--dry-run', meson.current_source_dir()])
-endif
 
 #========================
 # metainfo confuses windows, icons are handled differently there, 
@@ -90,10 +86,7 @@ desktop_file = i18n.merge_file(
     install_dir: get_option('datadir') / 'applications',
 )
 
-desktop_utils = find_program('desktop-file-validate', required: false)
-if desktop_utils.found()
-    test('Validate desktop file', desktop_utils, args: [desktop_file])
-endif
+
 
 
 #========================
@@ -115,8 +108,3 @@ appstream_file = i18n.merge_file(
     install_dir: get_option('datadir') / 'metainfo',
 )
 
-appstreamcli = find_program('appstreamcli', required: false)
-if appstreamcli.found()
-    test('Validate appstream file', appstreamcli, args: ['validate', '--pedantic', '--no-net', '--explain', appstream_file])
-endif
-
diff --git a/meson.build b/meson.build
index a747c6ce..55079c12 100644
--- a/meson.build
+++ b/meson.build
@@ -39,7 +39,7 @@ endif
 
 gnome = import('gnome')
 i18n = import('i18n')
-add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (app_name), language:'c')
+    add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (app_name), language:'c')
 
 #================================
 # Cool icon variants
@@ -114,6 +114,8 @@ if windows
     subdir('windows')
 endif
 
+subdir('tests')
+
 if not windows
     gnome.post_install(
       glib_compile_schemas: true,
diff --git a/tests/meson.build b/tests/meson.build
index c7d8aaac..f389850c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,7 +1,50 @@
+#
+#   TESTS
+#
+
+#========================
+# Linter and Appstream stuff
+
+vala_linter = find_program('io.elementary.vala-lint', required: false)
+if vala_linter.found()
+    test('lint',
+        vala_linter,
+        args: [meson.project_source_root() / 'src'],
+        is_parallel: true)
+endif
+
+compile_schemas = find_program('glib-compile-schemas', required: false)
+if compile_schemas.found()
+    test('schema',
+        compile_schemas,
+        args: ['--strict', '--dry-run', meson.project_source_root() / 'data'],
+        is_parallel: true)
+endif
+
+# Windows cares not for Appstream
+if not windows
+    desktop_utils = find_program('desktop-file-validate', required: false)
+    if desktop_utils.found()
+        test('desktop',
+            desktop_utils,
+            args: [desktop_file],
+            is_parallel: true)
+    endif
+
+    appstreamcli = find_program('appstreamcli', required: false)
+    if appstreamcli.found()
+        test('metainfo',
+            appstreamcli,
+            args: ['validate', '--pedantic', '--no-net', '--explain', appstream_file],
+            is_parallel: true)
+    endif
+endif
+
+
+#========================
+# Services
+
 
-########### META:
-# Linter
-# Appstream files and co
 # Storage: Load and save
 
 ### Services
@@ -9,7 +52,8 @@
 # Build some services and enums. Do random manipulations and compare
 
 
-#### UI
+#========================
+#  Widgets
 # build specific widgets:
 
 # Textview