From 62d5ef62f0812fc52e698e662230f79c657704c8 Mon Sep 17 00:00:00 2001
From: "Florine W. Dekker" <florine@fwdekker.com>
Date: Sat, 16 Sep 2023 14:51:08 +0200
Subject: [PATCH] Finalise full test rewrite

---
 .config/detekt/.detekt.yml                    |   9 +-
 README.md                                     |   2 +-
 .../kotlin/com/fwdekker/randomness/Bundle.kt  |  15 ++-
 .../com/fwdekker/randomness/SchemeEditor.kt   |   5 +-
 .../randomness/decimal/DecimalScheme.kt       |   2 +-
 .../fwdekker/randomness/template/Template.kt  |   2 +-
 .../template/TemplateActionLoader.kt          |  62 ++++------
 .../randomness/template/TemplateActions.kt    |  10 +-
 .../randomness/template/TemplateJTree.kt      |   8 +-
 .../randomness/template/TemplateJTreeModel.kt |  23 ++--
 .../template/TemplateListConfigurable.kt      |   3 +-
 .../randomness/template/TemplateListEditor.kt |   6 +-
 .../randomness/template/TemplateReference.kt  |   2 +-
 .../fwdekker/randomness/ui/JDateTimeField.kt  |   2 +-
 .../fwdekker/randomness/ui/JNumberSpinners.kt |   1 -
 .../fwdekker/randomness/ui/PreviewPanel.kt    |   2 +-
 .../randomness/word/WordSchemeEditor.kt       |   2 +-
 src/main/resources/META-INF/plugin.xml        |   3 +-
 .../com/fwdekker/randomness/AssertJHelper.kt  |  10 +-
 .../com/fwdekker/randomness/BundleTest.kt     |  11 +-
 .../kotlin/com/fwdekker/randomness/Dummies.kt |   3 +-
 .../{DummiesTest.kt => DummySchemeTest.kt}    |   0
 .../fwdekker/randomness/EditorTestFactory.kt  |  21 ++--
 .../com/fwdekker/randomness/IconsTest.kt      |  13 ++-
 .../fwdekker/randomness/InsertActionTest.kt   |   4 +-
 .../com/fwdekker/randomness/Matchers.kt       |   2 +-
 .../fwdekker/randomness/SchemeEditorTest.kt   |  11 +-
 .../com/fwdekker/randomness/SchemeTest.kt     |   6 +-
 .../affix/AffixDecoratorEditorTest.kt         |  17 +++
 .../array/ArrayDecoratorEditorTest.kt         |   8 +-
 .../randomness/array/ArrayDecoratorTest.kt    |  10 +-
 .../randomness/datetime/DateTimeSchemeTest.kt |   8 +-
 .../decimal/DecimalSchemeEditorTest.kt        |  20 ++--
 .../randomness/decimal/DecimalSchemeTest.kt   |   5 +-
 .../fixedlength/FixedLengthDecoratorTest.kt   |   2 +-
 .../integer/IntegerSchemeEditorTest.kt        |  12 +-
 .../randomness/integer/IntegerSchemeTest.kt   |   7 +-
 .../randomness/string/StringSchemeTest.kt     |   4 +-
 .../template/TemplateActionLoaderTest.kt      |  40 ++++---
 .../template/TemplateActionTests.kt           |  17 +--
 .../randomness/template/TemplateEditorTest.kt |  51 ++------
 .../template/TemplateJTreeModelTest.kt        | 109 +++++++++---------
 .../randomness/template/TemplateJTreeTest.kt  |  83 +++++++------
 .../template/TemplateReferenceEditorTest.kt   |  13 ++-
 .../template/TemplateReferenceTest.kt         |  33 +++---
 .../randomness/template/TemplateTest.kt       |  25 ++--
 .../randomness/ui/JDateTimeFieldTest.kt       |  39 ++++---
 .../randomness/ui/ListenerHelperTest.kt       |  45 +-------
 .../randomness/uuid/UuidSchemeEditorTest.kt   |  29 +++--
 .../randomness/word/WordSchemeEditorTest.kt   |   5 +-
 50 files changed, 408 insertions(+), 414 deletions(-)
 rename src/test/kotlin/com/fwdekker/randomness/{DummiesTest.kt => DummySchemeTest.kt} (100%)
 create mode 100644 src/test/kotlin/com/fwdekker/randomness/affix/AffixDecoratorEditorTest.kt

diff --git a/.config/detekt/.detekt.yml b/.config/detekt/.detekt.yml
index 49b6da2b0..ed3f4c87c 100644
--- a/.config/detekt/.detekt.yml
+++ b/.config/detekt/.detekt.yml
@@ -16,6 +16,9 @@ complexity:
   # [False Positive] Solved using resource bundles. All remaining duplicates are resource identifiers.
   StringLiteralDuplication:
     active: false
+  # [Exception] Acceptable for helper files.
+  TooManyFunctions:
+    excludes: '**/*Helper.kt'
 
 formatting:
   # [Disagree] Acceptable for many short arguments.
@@ -39,6 +42,9 @@ formatting:
   # [Disagree] Consecutive blank lines are used consistently to group blocks of code.
   NoConsecutiveBlankLines:
     active: false
+  # [Disagree] Required for lists and varargs, but ugly when it is unlikely that the function signature will change.
+  TrailingCommaOnCallSite:
+    active: false
 
 potential-bugs:
   # [Exception] Initialised by scene builder.
@@ -63,8 +69,7 @@ style:
     active: false
   # [Exception] Acceptable in (parameterized) tests.
   DestructuringDeclarationWithTooManyEntries:
-    excludes:
-      - '**/test/**'
+    excludes: '**/test/**'
   # [Bug] Fails when used as function expression body.
   MultilineRawStringIndentation:
     active: false
diff --git a/README.md b/README.md
index e349f9ccc..4f286dad6 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ See [Plugin Signing](https://plugins.jetbrains.com/docs/intellij/plugin-signing.
 ### 🧪 Quality assurance
 ```bash
 $ gradlew test                # Run tests
-$ gradlew test --tests X      # Run tests in class X
+$ gradlew test --tests X      # Run tests in class X (package name optional)
 $ gradlew check               # Run tests and static analysis
 $ gradlew runPluginVerifier   # Check for compatibility issues
 ```
diff --git a/src/main/kotlin/com/fwdekker/randomness/Bundle.kt b/src/main/kotlin/com/fwdekker/randomness/Bundle.kt
index 3dbede3a3..93c29a90a 100644
--- a/src/main/kotlin/com/fwdekker/randomness/Bundle.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/Bundle.kt
@@ -42,6 +42,17 @@ object Bundle {
  *
  * @throws java.util.MissingFormatArgumentException if [args] has fewer arguments than required for [format]
  */
-// TODO: Simplify documentation everywhere throughout the project to remove redundant `@param` specifications
 fun String.matchesFormat(format: String, vararg args: String) =
-    Regex(format.format(*args).replace(Regex("%[0-9]+\\\$[Ss]"), ".*")).matches(this)
+    // TODO: Simplify documentation everywhere throughout the project to remove redundant `@param` specifications
+    Regex("%[0-9]+\\\$[Ss]").findAll(format)
+        .toList()
+        .reversed()
+        .fold(format) { acc, match ->
+            if (match.value.drop(1).dropLast(2).toInt() > args.size)
+                acc.replaceRange(match.range, ".*")
+            else
+                acc
+        }
+        .format(*args)
+        .let { Regex(it) }
+        .matches(this)
diff --git a/src/main/kotlin/com/fwdekker/randomness/SchemeEditor.kt b/src/main/kotlin/com/fwdekker/randomness/SchemeEditor.kt
index c9cfebf60..12b3e4302 100644
--- a/src/main/kotlin/com/fwdekker/randomness/SchemeEditor.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/SchemeEditor.kt
@@ -11,7 +11,7 @@ import javax.swing.JComponent
  * An editor for a [Scheme].
  *
  * @param S the type of scheme edited in this editor
- * @param scheme the scheme edited in this editor
+ * @property scheme the scheme edited in this editor
  */
 abstract class SchemeEditor<S : Scheme>(val scheme: S) : Disposable {
     /**
@@ -70,12 +70,13 @@ abstract class SchemeEditor<S : Scheme>(val scheme: S) : Disposable {
      *
      * @param listener the function to invoke on every change in this editor
      */
+    @Suppress("detekt:SpreadOperator") // Acceptable because this method is called rarely
     fun addChangeListener(listener: () -> Unit) =
         addChangeListenerTo(*(components + decoratorEditors).toTypedArray(), listener = listener)
 
 
     /**
-     * Disposes of this editor's resources.
+     * Disposes this editor's resources.
      */
     override fun dispose() = Disposer.dispose(this)
 }
diff --git a/src/main/kotlin/com/fwdekker/randomness/decimal/DecimalScheme.kt b/src/main/kotlin/com/fwdekker/randomness/decimal/DecimalScheme.kt
index 948d9d49d..dc08601b3 100644
--- a/src/main/kotlin/com/fwdekker/randomness/decimal/DecimalScheme.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/decimal/DecimalScheme.kt
@@ -130,7 +130,7 @@ data class DecimalScheme(
         /**
          * The default value of the [showTrailingZeroes] field.
          */
-        const val DEFAULT_SHOW_TRAILING_ZEROES = true
+        const val DEFAULT_SHOW_TRAILING_ZEROES = false
 
         /**
          * The preset values for the [decimalSeparator] field.
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/Template.kt b/src/main/kotlin/com/fwdekker/randomness/template/Template.kt
index cf533be33..3cf3917cc 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/Template.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/Template.kt
@@ -37,7 +37,7 @@ data class Template(
             WordScheme::class,
         ]
     )
-    val schemes: MutableList<Scheme> = DEFAULT_SCHEMES,
+    var schemes: MutableList<Scheme> = DEFAULT_SCHEMES,
     val arrayDecorator: ArrayDecorator = DEFAULT_ARRAY_DECORATOR,
 ) : Scheme() {
     override val typeIcon
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateActionLoader.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateActionLoader.kt
index 4e2df455d..cbbfc5e3f 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateActionLoader.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateActionLoader.kt
@@ -6,22 +6,20 @@ import com.intellij.openapi.actionSystem.impl.DynamicActionConfigurationCustomiz
 
 
 /**
- * Registers and unregisters actions for the user's [Template]s so that they can be inserted using shortcuts.
+ * Registers, replaces, and unregisters actions for the user's [Template]s so that they can be inserted using shortcuts.
+ *
+ * @property getTemplates shorthand to return all the user's stored [Template]s
  */
-class TemplateActionLoader : DynamicActionConfigurationCustomizer {
-    /**
-     * Shorthand to return all the user's stored [Template]s.
-     */
-    private val templates: List<Template> get() = PersistentSettings.default.state.templates
-
-
+open class TemplateActionLoader(
+    private val getTemplates: () -> List<Template> = { PersistentSettings.default.state.templates },
+) : DynamicActionConfigurationCustomizer {
     /**
      * Registers the actions for all [Template]s in the user's [PersistentSettings].
      *
      * @param actionManager the manager to register actions through
      */
     override fun registerActions(actionManager: ActionManager) {
-        templates.forEach { registerAction(actionManager, it) }
+        getTemplates().forEach { registerAction(actionManager, it) }
     }
 
     /**
@@ -30,7 +28,7 @@ class TemplateActionLoader : DynamicActionConfigurationCustomizer {
      * @param actionManager the manager to unregister actions through
      */
     override fun unregisterActions(actionManager: ActionManager) {
-        templates.forEach { unregisterAction(actionManager, it) }
+        getTemplates().forEach { unregisterAction(actionManager, it) }
     }
 
 
@@ -39,23 +37,15 @@ class TemplateActionLoader : DynamicActionConfigurationCustomizer {
      *
      * @param oldList the list of stored [Template]s before storing [newList]
      * @param newList the list of stored [Template]s after storing them
+     * @param actionManager the manager with which actions are (de)registered
      */
-    fun updateActions(oldList: Set<Template>, newList: Set<Template>) {
-        val actionManager = ActionManager.getInstance()
-
-        val newUuids = newList.map { it.uuid }
-        oldList.filterNot { it.uuid in newUuids }.forEach {
-            // TODO: Remove ALL actions, not just the one with `actionId`?
-            if (actionManager.getAction(it.actionId) != null)
-                actionManager.unregisterAction(it.actionId)
-        }
-
-        newList.forEach {
-            if (actionManager.getAction(it.actionId) == null)
-                registerAction(actionManager, it)
-            else
-                replaceAction(actionManager, it)
-        }
+    fun updateActions(
+        oldList: List<Template>,
+        newList: List<Template>,
+        actionManager: ActionManager = ActionManager.getInstance(),
+    ) {
+        oldList.filterNot { it in newList }.forEach { unregisterAction(actionManager, it) }
+        newList.forEach { registerAction(actionManager, it) }
     }
 
 
@@ -82,8 +72,10 @@ class TemplateActionLoader : DynamicActionConfigurationCustomizer {
      */
     private fun registerAction(actionManager: ActionManager, template: Template) =
         getActions(template).forEach { (actionId, action) ->
-            actionManager.registerAction(actionId, action)
-            actionManager.replaceAction(actionId, action)
+            if (actionManager.getAction(actionId) == null)
+                actionManager.registerAction(actionId, action)
+            else
+                actionManager.replaceAction(actionId, action)
         }
 
     /**
@@ -94,13 +86,9 @@ class TemplateActionLoader : DynamicActionConfigurationCustomizer {
      */
     private fun unregisterAction(actionManager: ActionManager, template: Template) =
         getActions(template).forEach { (actionId, _) -> actionManager.unregisterAction(actionId) }
-
-    /**
-     * Replaces the actions associated with [template].
-     *
-     * @param actionManager the manager to replace actions through
-     * @param template the [Template] to replace actions for
-     */
-    private fun replaceAction(actionManager: ActionManager, template: Template) =
-        getActions(template).forEach { (actionId, action) -> actionManager.replaceAction(actionId, action) }
 }
+
+/**
+ * Constructor-less version of [TemplateActionLoader], as is required in `plugin.xml`.
+ */
+class DefaultTemplateActionLoader : TemplateActionLoader()
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateActions.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateActions.kt
index c55e348ea..8477bfd08 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateActions.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateActions.kt
@@ -145,15 +145,11 @@ class TemplateInsertAction(
 
         /**
          * Returns the component that the [editor] prefers to be focused when the editor is focused.
-         *
-         * @return the component that the [editor] prefers to be focused when the editor is focused.
          */
         override fun getPreferredFocusedComponent() = editor.preferredFocusedComponent
 
         /**
          * Creates a component containing the [editor] and the [previewPanel].
-         *
-         * @return a component containing the [editor] and the [previewPanel]
          */
         override fun createComponent() =
             JPanel(BorderLayout())
@@ -163,9 +159,7 @@ class TemplateInsertAction(
                 }
 
         /**
-         * Returns `true`
-         *
-         * @return `true`
+         * Returns `true`.
          */
         override fun isModified() = true
 
@@ -176,8 +170,6 @@ class TemplateInsertAction(
 
         /**
          * Returns [text].
-         *
-         * @return [text]
          */
         override fun getDisplayName() = text
 
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTree.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTree.kt
index 68c9c413a..9caf25130 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTree.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTree.kt
@@ -37,12 +37,12 @@ import kotlin.math.min
 /**
  * A tree containing [Template]s and [Scheme]s.
  *
- * The tree contains the templates and schemes defined in the [TemplateList] of [currentSettings] by loading that list into
- * this tree's [TemplateJTreeModel]. Furthermore, when a new [Scheme] is added or copied, it will use the
+ * The tree contains the templates and schemes defined in the [TemplateList] of [currentSettings] by loading that list
+ * into this tree's [TemplateJTreeModel]. Furthermore, when a new [Scheme] is added or copied, it will use the
  * [currentSettings].
  *
- * This tree reads from [originalSettings] to determine whether particular [Scheme]s have been modified. Modified [Scheme]s
- * can be reset, in which case the original state is copied into that scheme in the [currentSettings].
+ * This tree reads from [originalSettings] to determine whether particular [Scheme]s have been modified. Modified
+ * [Scheme]s can be reset, in which case the original state is copied into that scheme in the [currentSettings].
  *
  * @property originalSettings The original settings before any modifications were made.
  * @property currentSettings The current settings which include modifications.
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTreeModel.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTreeModel.kt
index 93a60f7cb..9d33eca2a 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTreeModel.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateJTreeModel.kt
@@ -87,21 +87,24 @@ class TemplateJTreeModel(list: TemplateList = TemplateList(mutableListOf())) : T
     /**
      * Not implemented because this method is used only if this is a model for a table.
      *
-     * @throws NotImplementedError always
+     * @throws UnsupportedOperationException always
      */
-    @Throws(NotImplementedError::class)
-    override fun addRow() = throw NotImplementedError(Bundle("template_list.error.add_empty_row"))
+    @Throws(UnsupportedOperationException::class)
+    override fun addRow() =
+        throw UnsupportedOperationException(Bundle("template_list.error.add_empty_row"))
 
     /**
      * Not implemented because this method is used only if this is a model for a table.
      *
-     * @throws NotImplementedError always
+     * @throws UnsupportedOperationException always
      */
-    @Throws(NotImplementedError::class)
-    override fun removeRow(index: Int) = throw NotImplementedError(Bundle("template_list.error.remove_row_by_index"))
+    @Throws(UnsupportedOperationException::class)
+    override fun removeRow(index: Int) =
+        throw UnsupportedOperationException(Bundle("template_list.error.remove_row_by_index"))
 
     /**
-     * Moves the node at row [oldIndex] to row [newIndex], and expands and selects the moved node.
+     * Exchanges two consecutive rows, moving the node at row [oldIndex] to row [newIndex], and expands and selects the
+     * moved node.
      *
      * Indices are looked up using [rowToNode], and are typically relative to the current expansion state of the view.
      *
@@ -396,11 +399,11 @@ class TemplateJTreeModel(list: TemplateList = TemplateList(mutableListOf())) : T
     /**
      * Not implemented because this model does not contain an editor component.
      *
-     * @throws NotImplementedError always
+     * @throws UnsupportedOperationException always
      */
-    @Throws(NotImplementedError::class)
+    @Throws(UnsupportedOperationException::class)
     override fun valueForPathChanged(path: TreePath, newValue: Any) =
-        throw NotImplementedError(Bundle("template_list.error.change_value_by_path"))
+        throw UnsupportedOperationException(Bundle("template_list.error.change_value_by_path"))
 
     /**
      * Adds [listener] as a listener.
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateListConfigurable.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateListConfigurable.kt
index ece2bdac4..f3a6c7e60 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateListConfigurable.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateListConfigurable.kt
@@ -22,6 +22,7 @@ class TemplateListConfigurable : Configurable {
     /**
      * The user interface for changing the settings, displayed in IntelliJ's settings window.
      */
+    @Suppress("detekt:LateinitUsage") // Initialized in `createComponent`
     lateinit var editor: TemplateListEditor private set
 
     /**
@@ -57,7 +58,7 @@ class TemplateListConfigurable : Configurable {
     override fun reset() = editor.reset()
 
     /**
-     * Disposes of the configurable's resources.
+     * Disposes the configurable's resources.
      */
     override fun disposeUIResources() {
         editor.dispose()
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateListEditor.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateListEditor.kt
index 44c5283ef..0579141f3 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateListEditor.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateListEditor.kt
@@ -39,7 +39,7 @@ import javax.swing.SwingUtilities
  *
  * Though this editor only changes [TemplateList]s, it still maintains a reference to
  *
- * @param originalSettings the settings containing the templates to edit
+ * @property originalSettings the settings containing the templates to edit
  * @see TemplateListConfigurable
  */
 class TemplateListEditor(private val originalSettings: Settings = Settings.DEFAULT) : Disposable {
@@ -182,9 +182,9 @@ class TemplateListEditor(private val originalSettings: Settings = Settings.DEFAU
      * Does nothing if and only if [isModified] returns `false`.
      */
     fun applyState() {
-        val oldList = originalSettings.templates.toSet()
+        val oldList = originalSettings.templates
         originalSettings.copyFrom(readState())
-        val newList = originalSettings.templates.toSet()
+        val newList = originalSettings.templates
 
         TemplateActionLoader().updateActions(oldList, newList)
     }
diff --git a/src/main/kotlin/com/fwdekker/randomness/template/TemplateReference.kt b/src/main/kotlin/com/fwdekker/randomness/template/TemplateReference.kt
index 34908d493..b9a704dbc 100644
--- a/src/main/kotlin/com/fwdekker/randomness/template/TemplateReference.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/template/TemplateReference.kt
@@ -92,7 +92,7 @@ data class TemplateReference(
             templateUuid == null -> Bundle("reference.error.no_selection")
             template == null -> Bundle("reference.error.not_found")
             recursion != null -> Bundle("reference.error.recursion", "(${recursion.joinToString(" → ") { it.name }})")
-            else -> arrayDecorator.doValidate()
+            else -> affixDecorator.doValidate() ?: arrayDecorator.doValidate()
         }
     }
 
diff --git a/src/main/kotlin/com/fwdekker/randomness/ui/JDateTimeField.kt b/src/main/kotlin/com/fwdekker/randomness/ui/JDateTimeField.kt
index 2023aa61b..4cc45ab06 100644
--- a/src/main/kotlin/com/fwdekker/randomness/ui/JDateTimeField.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/ui/JDateTimeField.kt
@@ -19,7 +19,7 @@ class JDateTimeField(
     private val default: LocalDateTime = LocalDateTime.now(),
 ) : JFormattedTextField(DateTimeFormatter()) {
     /**
-     * The current [value] represented as a [Long].
+     * The current [value] represented as a [Long] of the millisecond epoch.
      */
     var longValue: Long
         get() = value.toEpochMilli()
diff --git a/src/main/kotlin/com/fwdekker/randomness/ui/JNumberSpinners.kt b/src/main/kotlin/com/fwdekker/randomness/ui/JNumberSpinners.kt
index e73cc1491..0d6850c0c 100644
--- a/src/main/kotlin/com/fwdekker/randomness/ui/JNumberSpinners.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/ui/JNumberSpinners.kt
@@ -1,6 +1,5 @@
 package com.fwdekker.randomness.ui
 
-import com.fwdekker.randomness.Bundle
 import java.text.DecimalFormatSymbols
 import java.util.Locale
 import javax.swing.JComponent
diff --git a/src/main/kotlin/com/fwdekker/randomness/ui/PreviewPanel.kt b/src/main/kotlin/com/fwdekker/randomness/ui/PreviewPanel.kt
index c7f47b191..322a58583 100644
--- a/src/main/kotlin/com/fwdekker/randomness/ui/PreviewPanel.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/ui/PreviewPanel.kt
@@ -78,7 +78,7 @@ class PreviewPanel(private val getScheme: () -> Scheme) : Disposable {
     }
 
     /**
-     * Disposes of this panel's resources, to be used when this panel is no longer used.
+     * Disposes this panel's resources, to be used when this panel is no longer used.
      */
     override fun dispose() = Disposer.dispose(this)
 
diff --git a/src/main/kotlin/com/fwdekker/randomness/word/WordSchemeEditor.kt b/src/main/kotlin/com/fwdekker/randomness/word/WordSchemeEditor.kt
index 8ef6d01cd..5d5e2faeb 100644
--- a/src/main/kotlin/com/fwdekker/randomness/word/WordSchemeEditor.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/word/WordSchemeEditor.kt
@@ -78,7 +78,7 @@ class WordSchemeEditor(scheme: WordScheme = WordScheme()) : SchemeEditor<WordSch
                     .withFixedHeight(UIConstants.SIZE_VERY_LARGE)
                     .bind(
                         { document.getWordList() },
-                        { _, it: List<String> -> document.setWordList(it) },
+                        { _, list: List<String> -> document.setWordList(list) },
                         scheme::words.toMutableProperty()
                     )
             }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 979e17803..36ea2d48a 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -18,7 +18,8 @@
                                  displayName="Randomness" />
 
         <!-- Dynamically loads, unloads, and updates template actions -->
-        <dynamicActionConfigurationCustomizer implementation="com.fwdekker.randomness.template.TemplateActionLoader" />
+        <dynamicActionConfigurationCustomizer
+            implementation="com.fwdekker.randomness.template.DefaultTemplateActionLoader" />
     </extensions>
 
     <!-- Non-dynamic actions -->
diff --git a/src/test/kotlin/com/fwdekker/randomness/AssertJHelper.kt b/src/test/kotlin/com/fwdekker/randomness/AssertJHelper.kt
index 41d7ee57b..d46eeafc0 100644
--- a/src/test/kotlin/com/fwdekker/randomness/AssertJHelper.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/AssertJHelper.kt
@@ -10,12 +10,13 @@ import io.kotest.core.spec.style.scopes.ContainerScope
 import io.kotest.core.test.TestType
 import org.assertj.swing.core.GenericTypeMatcher
 import org.assertj.swing.edt.GuiActionRunner
+import org.assertj.swing.fixture.AbstractTwoStateButtonFixture
 import org.assertj.swing.fixture.FrameFixture
-import org.assertj.swing.fixture.JCheckBoxFixture
 import org.assertj.swing.fixture.JComboBoxFixture
 import org.assertj.swing.fixture.JSpinnerFixture
 import org.assertj.swing.fixture.JTextComponentFixture
 import java.awt.Component
+import javax.swing.AbstractButton
 import kotlin.reflect.KMutableProperty0
 
 
@@ -80,9 +81,12 @@ fun <T> KMutableProperty0<T>.prop(): MutableProperty<Any?> = MutableProperty({ g
 fun <SELF, FIELD> SELF.prop(get: (SELF) -> (() -> FIELD), set: (SELF) -> ((FIELD) -> Unit)): MutableProperty<Any?> =
     MutableProperty(get(this)) { set(this)(it as FIELD) }
 
-fun JCheckBoxFixture.isSelectedProp() = this.prop({ this.target()::isSelected }, { this.target()::setSelected })
+fun <S, T : AbstractButton> AbstractTwoStateButtonFixture<S, T>.isSelectedProp() =
+    this.prop({ this.target()::isSelected }, { this.target()::setSelected })
 
-fun JComboBoxFixture.itemProp() = this.prop({ this.target().editor::getItem }, { this.target().editor::setItem })
+fun JComboBoxFixture.itemProp() = this.prop({ this.target()::getSelectedItem }, { this.target()::setSelectedItem })
+
+fun JComboBoxFixture.textProp() = this.prop({ this.target().editor::getItem }, { this.target().editor::setItem })
 
 fun JSpinnerFixture.valueProp() = this.prop({ this.target()::getValue }, { this.target()::setValue })
 
diff --git a/src/test/kotlin/com/fwdekker/randomness/BundleTest.kt b/src/test/kotlin/com/fwdekker/randomness/BundleTest.kt
index b665a6281..98063e5ca 100644
--- a/src/test/kotlin/com/fwdekker/randomness/BundleTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/BundleTest.kt
@@ -1,12 +1,13 @@
 package com.fwdekker.randomness
 
+import io.kotest.assertions.throwables.shouldNotThrow
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.data.row
 import io.kotest.datatest.withData
 import io.kotest.matchers.shouldBe
-import java.util.MissingFormatArgumentException
 import java.util.MissingResourceException
+import java.util.regex.PatternSyntaxException
 
 
 /**
@@ -34,8 +35,8 @@ object BundleTest : FunSpec({
     }
 
     context("matchesFormat") {
-        test("throws a MissingFormatArgumentException if insufficient arguments are given") {
-            shouldThrow<MissingFormatArgumentException> { "anything".matchesFormat("%1\$s") }
+        test("ignores excessive arguments") {
+            shouldNotThrow<PatternSyntaxException> { "string".matchesFormat("%1\$s", "arg1", "arg2") }
         }
 
         withData(
@@ -46,8 +47,10 @@ object BundleTest : FunSpec({
             row("one arg, mismatch in format", "%1\$s arg, different format", arrayOf("one"), false),
             row("one arg, mismatch in arg", "%1\$s arg, mismatch in arg", arrayOf("different"), false),
             row("two args, match", "%1\$s args, %2\$s", arrayOf("two", "match"), true),
+            row("two args, match with open arg", "%1\$s args, %2\$s", arrayOf("two"), true),
             row("two args, mismatch in format", "%1\$s args, different %2\$s", arrayOf("two", "format"), false),
-            row("two args, mismatch in arg", "%1\$s args, mismatch %2\$s", arrayOf("different", "arg"), false),
+            row("two args, mismatch in arg", "%1\$s args, %2\$s in arg", arrayOf("two", "different"), false),
+            row("two args, mismatch with open arg", "%1\$s args, %2\$s with open arg", arrayOf("mismatch"), false),
         ) { (input, format, args, matches) ->
             input.matchesFormat(format, *args) shouldBe matches
         }
diff --git a/src/test/kotlin/com/fwdekker/randomness/Dummies.kt b/src/test/kotlin/com/fwdekker/randomness/Dummies.kt
index f52c63ef5..5c77606ba 100644
--- a/src/test/kotlin/com/fwdekker/randomness/Dummies.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/Dummies.kt
@@ -1,5 +1,6 @@
 package com.fwdekker.randomness
 
+import com.fwdekker.randomness.ui.withName
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
@@ -83,7 +84,7 @@ class DummySchemeEditor(
 class DummyDecoratorSchemeEditor(
     scheme: DummyDecoratorScheme = DummyDecoratorScheme(),
 ) : SchemeEditor<DummyDecoratorScheme>(scheme) {
-    override val rootComponent = panel { row { textField().bindText(scheme::append) } }
+    override val rootComponent = panel { row { textField().withName("decoratorText").bindText(scheme::append) } }
 }
 
 /**
diff --git a/src/test/kotlin/com/fwdekker/randomness/DummiesTest.kt b/src/test/kotlin/com/fwdekker/randomness/DummySchemeTest.kt
similarity index 100%
rename from src/test/kotlin/com/fwdekker/randomness/DummiesTest.kt
rename to src/test/kotlin/com/fwdekker/randomness/DummySchemeTest.kt
diff --git a/src/test/kotlin/com/fwdekker/randomness/EditorTestFactory.kt b/src/test/kotlin/com/fwdekker/randomness/EditorTestFactory.kt
index b793938c6..be07670c3 100644
--- a/src/test/kotlin/com/fwdekker/randomness/EditorTestFactory.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/EditorTestFactory.kt
@@ -1,6 +1,7 @@
 package com.fwdekker.randomness
 
 import com.intellij.ui.dsl.builder.MutableProperty
+import io.kotest.assertions.withClue
 import io.kotest.core.factory.TestFactory
 import io.kotest.core.spec.style.funSpec
 import io.kotest.data.Row3
@@ -26,33 +27,37 @@ fun editorApplyTestFactory(editor: () -> SchemeEditor<*>) = funSpec {
 }
 
 /**
- * Tests that the [SchemeEditor.apply] method
+ * Tests that the fields of a [SchemeEditor] are bound correctly.
+ *
+ * @param S the type of scheme in the editor
+ * @param editor returns the editor to test
+ * @param fields the field's name, a property for the field in the editor, and a property for the field in the scheme
  */
-fun <S : Scheme, T : Any?> editorFieldsTestFactory(
+fun <S : Scheme> editorFieldsTestFactory(
     editor: () -> SchemeEditor<S>,
-    fields: Map<String, Row3<() -> MutableProperty<T>, () -> MutableProperty<T>, T>>,
+    fields: Map<String, Row3<() -> MutableProperty<Any?>, () -> MutableProperty<Any?>, Any?>>,
 ): TestFactory {
     return funSpec {
         context("bindings") {
             context("'apply' stores the editor's field in the scheme's field") {
                 withData(fields) { (editorProperty, schemeProperty, value) ->
-                    schemeProperty().get() shouldNotBe value
+                    withClue("Pre: Scheme value should not be set value") { schemeProperty().get() shouldNotBe value }
 
                     guiRun { editorProperty().set(value) }
                     guiRun { editor().apply() }
 
-                    schemeProperty().get() shouldBe value
+                    withClue("Post: Scheme value should be set value") { schemeProperty().get() shouldBe value }
                 }
             }
 
             context("'reset' loads the scheme's field into the editor's field") {
                 withData(fields) { (editorProperty, schemeProperty, value) ->
-                    guiGet { editorProperty().get() } shouldNotBe value
+                    withClue("Pre: Editor value should not be set value") { editorProperty().get() shouldNotBe value }
 
                     schemeProperty().set(value)
                     guiRun { editor().reset() }
 
-                    guiGet { editorProperty().get() } shouldBe value
+                    withClue("Post: Editor value should be set value") { editorProperty().get() shouldBe value }
                 }
             }
 
@@ -63,7 +68,7 @@ fun <S : Scheme, T : Any?> editorFieldsTestFactory(
 
                     guiRun { editorProperty().set(value) }
 
-                    invoked shouldBeGreaterThanOrEqual 1
+                    withClue("Listener should have been invoked") { invoked shouldBeGreaterThanOrEqual 1 }
                 }
             }
         }
diff --git a/src/test/kotlin/com/fwdekker/randomness/IconsTest.kt b/src/test/kotlin/com/fwdekker/randomness/IconsTest.kt
index f2c3538bf..2ab420f6a 100644
--- a/src/test/kotlin/com/fwdekker/randomness/IconsTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/IconsTest.kt
@@ -3,8 +3,11 @@ package com.fwdekker.randomness
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.collections.beEmpty
 import io.kotest.matchers.collections.shouldContainExactly
+import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNot
 import io.kotest.matchers.shouldNotBe
 import io.kotest.matchers.types.shouldBeSameInstanceAs
 import org.assertj.swing.edt.FailOnThreadViolationRepaintManager
@@ -81,18 +84,16 @@ object TypeIconTest : FunSpec({
                 this.dispose()
             }
 
-            image.getRGB(0, 0, 32, 32, null, 0, 32).forEach { it shouldBe 0 }
+            image.getRGB(0, 0, 32, 32, null, 0, 32).filter { it != 0 } should beEmpty()
         }
 
-        test("paints something otherwise") {
+        test("paints something if the component is not null") {
             with(image.createGraphics()) {
-                val label = guiGet { JLabel() }
-
-                TypeIcon(PlainIcon(), "text", listOf(Color.GRAY)).paintIcon(label, this, 0, 0)
+                TypeIcon(PlainIcon(), "text", listOf(Color.GRAY)).paintIcon(guiGet { JLabel() }, this, 0, 0)
                 this.dispose()
             }
 
-            image.getRGB(0, 0, 32, 32, null, 0, 32).forEach { it shouldNotBe 0 }
+            image.getRGB(0, 0, 32, 32, null, 0, 32).filter { it != 0 } shouldNot beEmpty()
         }
     }
 })
diff --git a/src/test/kotlin/com/fwdekker/randomness/InsertActionTest.kt b/src/test/kotlin/com/fwdekker/randomness/InsertActionTest.kt
index 90af7772f..730ffdfff 100644
--- a/src/test/kotlin/com/fwdekker/randomness/InsertActionTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/InsertActionTest.kt
@@ -13,9 +13,9 @@ import io.kotest.matchers.shouldBe
 /**
  * Integration tests for [InsertAction].
  */
-@Suppress("detekt:FunctionName", "detekt:FunctionMaxLength") // Makes JUnit tests easier to read
-// TODO: Convert to Kotest format
+@Suppress("detekt:FunctionMaxLength", "detekt:FunctionName", "detekt:TooManyFunctions")
 class InsertActionTest : BasePlatformTestCase() {
+    // TODO: Convert entire class to Kotest format
     private lateinit var document: Document
     private lateinit var caretModel: CaretModel
 
diff --git a/src/test/kotlin/com/fwdekker/randomness/Matchers.kt b/src/test/kotlin/com/fwdekker/randomness/Matchers.kt
index cb8b4d558..612de250f 100644
--- a/src/test/kotlin/com/fwdekker/randomness/Matchers.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/Matchers.kt
@@ -31,7 +31,7 @@ fun matchBundle(key: String, vararg args: String): Matcher<String?> =
     Matcher { string ->
         val format = Bundle(key)
         MatcherResult(
-            string != null && string.matchesFormat(format, *args),
+            string != null && (string == format || string.matchesFormat(format, *args)),
             { "string was '$string' but should have matched format '$format'" },
             { "string was '$string' and should not have matched format '$format'" },
         )
diff --git a/src/test/kotlin/com/fwdekker/randomness/SchemeEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/SchemeEditorTest.kt
index 2492dcbfb..c9ad23535 100644
--- a/src/test/kotlin/com/fwdekker/randomness/SchemeEditorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/SchemeEditorTest.kt
@@ -8,6 +8,7 @@ import com.intellij.ui.dsl.builder.panel
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldContainExactly
+import io.kotest.matchers.ints.shouldBeGreaterThanOrEqual
 import io.kotest.matchers.nulls.beNull
 import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
@@ -160,7 +161,7 @@ object SchemeEditorTest : FunSpec({
             guiRun { frame.textBox().target().text = "new" }
             editor.apply()
 
-            scheme.name shouldBe "new"
+            scheme.prefix shouldBe "new"
         }
 
         test("applies changes from decorators") {
@@ -199,13 +200,15 @@ object SchemeEditorTest : FunSpec({
         }
 
         test("invokes the listener when an extra component is edited") {
-            registerTestEditor { DummySchemeEditor { panel { row { textField().also { addExtraComponent(it) } } } } }
+            registerTestEditor {
+                DummySchemeEditor { panel { row { textField().also { addExtraComponent(it.component) } } } }
+            }
 
             var updateCount = 0
             editor.addChangeListener { updateCount++ }
             guiRun { frame.textBox().target().text = "new" }
 
-            updateCount shouldBe 1
+            updateCount shouldBeGreaterThanOrEqual 1
         }
 
         test("invokes the listener when a decorator editor's component is edited") {
@@ -228,7 +231,7 @@ object SchemeEditorTest : FunSpec({
             editor.addChangeListener { updateCount++ }
             guiRun { frame.textBox().target().text = "new" }
 
-            updateCount shouldBe 1
+            updateCount shouldBeGreaterThanOrEqual 2
         }
     }
 })
diff --git a/src/test/kotlin/com/fwdekker/randomness/SchemeTest.kt b/src/test/kotlin/com/fwdekker/randomness/SchemeTest.kt
index 3716fa9c6..05d294201 100644
--- a/src/test/kotlin/com/fwdekker/randomness/SchemeTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/SchemeTest.kt
@@ -8,8 +8,8 @@ import io.kotest.matchers.collections.shouldContainExactly
 import io.kotest.matchers.nulls.beNull
 import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
-import io.kotest.matchers.shouldNot
 import io.kotest.matchers.types.shouldBeSameInstanceAs
+import java.awt.Color
 
 
 /**
@@ -37,7 +37,7 @@ object SchemeTest : FunSpec({
         test("does not add icon overlays if the scheme has no decorators") {
             val scheme = DummyScheme()
 
-            scheme.icon!!.overlays shouldNot beEmpty()
+            scheme.icon!!.overlays should beEmpty()
         }
 
         test("does not add icon overlays if the scheme's decorators have no icons") {
@@ -49,7 +49,7 @@ object SchemeTest : FunSpec({
 
         test("adds the scheme's decorators' icons") {
             val decorator = DummyDecoratorScheme()
-            decorator.typeIcon = TypeIcon(Icons.SCHEME, "dum", emptyList())
+            decorator.typeIcon = TypeIcon(Icons.SCHEME, "dum", listOf(Color.GRAY))
             val scheme = DummyScheme(decorators = listOf(decorator))
 
             scheme.icon?.overlays shouldContainExactly listOf(decorator.icon)
diff --git a/src/test/kotlin/com/fwdekker/randomness/affix/AffixDecoratorEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/affix/AffixDecoratorEditorTest.kt
new file mode 100644
index 000000000..ad58eb95d
--- /dev/null
+++ b/src/test/kotlin/com/fwdekker/randomness/affix/AffixDecoratorEditorTest.kt
@@ -0,0 +1,17 @@
+package com.fwdekker.randomness.affix
+
+import io.kotest.core.NamedTag
+import io.kotest.core.spec.style.FunSpec
+
+
+/**
+ * Unit tests for [AffixDecoratorEditor].
+ */
+object AffixDecoratorEditorTest : FunSpec({
+    tags(NamedTag("TODO")) // TODO
+
+
+    xcontext("TODO") {
+        // TODO: Add these tests
+    }
+})
diff --git a/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditorTest.kt
index 6551956da..ee05edf77 100644
--- a/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorEditorTest.kt
@@ -7,9 +7,9 @@ import com.fwdekker.randomness.editorFieldsTestFactory
 import com.fwdekker.randomness.guiGet
 import com.fwdekker.randomness.guiRun
 import com.fwdekker.randomness.isSelectedProp
-import com.fwdekker.randomness.itemProp
 import com.fwdekker.randomness.matcher
 import com.fwdekker.randomness.prop
+import com.fwdekker.randomness.textProp
 import com.fwdekker.randomness.valueProp
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
@@ -181,7 +181,7 @@ object ArrayDecoratorEditorTest : FunSpec({
             mapOf(
                 "minCount" to
                     row(
-                        { frame.spinner("arrayMaxCount").valueProp() },
+                        { frame.spinner("arrayMinCount").valueProp() },
                         { editor.scheme::minCount.prop() },
                         1,
                     ),
@@ -199,13 +199,13 @@ object ArrayDecoratorEditorTest : FunSpec({
                     ),
                 "separator" to
                     row(
-                        { frame.comboBox("arraySeparator").itemProp() },
+                        { frame.comboBox("arraySeparator").textProp() },
                         { editor.scheme::separator.prop() },
                         " - ",
                     ),
                 "affixDecorator" to
                     row(
-                        { frame.comboBox("arrayAffixDescriptor").itemProp() },
+                        { frame.comboBox("arrayAffixDescriptor").textProp() },
                         { editor.scheme.affixDecorator::descriptor.prop() },
                         "{@}",
                     ),
diff --git a/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorTest.kt b/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorTest.kt
index 0a51cf3b0..ed1ea0f24 100644
--- a/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/array/ArrayDecoratorTest.kt
@@ -46,10 +46,10 @@ object ArrayDecoratorTest : FunSpec({
                         ArrayDecorator(enabled = true, separator = ",  "),
                         "[[i0],  [i1],  [i2]]",
                     ),
-                "converts escaped 'n' to newline" to
+                "converts escaped 'n' in separator to newline" to
                     row(
                         ArrayDecorator(enabled = true, separator = """\n"""),
-                        """[[i0]\n[i1]\n[i2]]""",
+                        "[[i0]\n[i1]\n[i2]]",
                     ),
                 "applies affix decorator" to
                     row(
@@ -76,7 +76,7 @@ object ArrayDecoratorTest : FunSpec({
             var i = 0
             scheme.generator = { count -> List(count) { "[i${i++}]" } }
 
-            scheme.generateStrings(count = 3) shouldBe listOf("[[i0], [i1], [i2]]", "[[i3], [i4], [i5]]")
+            scheme.generateStrings(count = 2) shouldBe listOf("[[i0], [i1], [i2]]", "[[i3], [i4], [i5]]")
         }
     }
 
@@ -89,8 +89,8 @@ object ArrayDecoratorTest : FunSpec({
                     row(ArrayDecorator(minCount = 0), "array.error.min_count_too_low"),
                 "fails for negative min count" to
                     row(ArrayDecorator(minCount = -23), "array.error.min_count_too_low"),
-                "fails for min count equals max count" to
-                    row(ArrayDecorator(minCount = 368, maxCount = 368), "array.error.min_count_above_max"),
+                "succeeds for min count equals max count" to
+                    row(ArrayDecorator(minCount = 368, maxCount = 368), null),
                 "fails for min count above max count" to
                     row(ArrayDecorator(minCount = 14, maxCount = 2), "array.error.min_count_above_max"),
                 "fails if affix decorator is invalid" to
diff --git a/src/test/kotlin/com/fwdekker/randomness/datetime/DateTimeSchemeTest.kt b/src/test/kotlin/com/fwdekker/randomness/datetime/DateTimeSchemeTest.kt
index 6046f5ee0..ab501a881 100644
--- a/src/test/kotlin/com/fwdekker/randomness/datetime/DateTimeSchemeTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/datetime/DateTimeSchemeTest.kt
@@ -23,11 +23,9 @@ object DateTimeSchemeTest : FunSpec({
         withData(
             mapOf(
                 "returns date at given timestamp" to
-                    // TODO
-                    row(DateTimeScheme().withDateTime(45_582L), "TODO"),
+                    row(DateTimeScheme().withDateTime(45_582L), "1970-01-01 00:00:45"),
                 "returns date with given format" to
-                    // TODO
-                    row(DateTimeScheme(pattern = "yyyy.MM").withDateTime(242_966_670L), "TODO.TD"),
+                    row(DateTimeScheme(pattern = "yyyy.MM").withDateTime(966_670L), "1970.01"),
             )
         ) { (scheme, output) -> scheme.generateStrings()[0] shouldBe output }
 
@@ -46,7 +44,7 @@ object DateTimeSchemeTest : FunSpec({
                 "fails if min date-time is above max date-time" to
                     row(DateTimeScheme(minDateTime = 531L, maxDateTime = 38L), "datetime.error.min_datetime_above_max"),
                 "fails if pattern is invalid" to
-                    row(DateTimeScheme(pattern = "yyyy-ffff"), "Unknown pattern letter: f"),
+                    row(DateTimeScheme(pattern = "yyyy-ffff"), ""),
                 "succeeds if invalid pattern is escaped" to
                     row(DateTimeScheme(pattern = "yyyy-'ffff'"), null),
             )
diff --git a/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeEditorTest.kt
index cfde9ec40..e01ba3317 100644
--- a/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeEditorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeEditorTest.kt
@@ -7,8 +7,8 @@ import com.fwdekker.randomness.editorFieldsTestFactory
 import com.fwdekker.randomness.guiGet
 import com.fwdekker.randomness.guiRun
 import com.fwdekker.randomness.isSelectedProp
-import com.fwdekker.randomness.itemProp
 import com.fwdekker.randomness.prop
+import com.fwdekker.randomness.textProp
 import com.fwdekker.randomness.valueProp
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
@@ -57,10 +57,10 @@ object DecimalSchemeEditorTest : FunSpec({
     context("input handling") {
         context("*Value") {
             test("binds the minimum and maximum values") {
-                guiRun { frame.spinner("minValue").target().value = 670L }
+                guiRun { frame.spinner("minValue").target().value = 3670.0 }
 
-                frame.spinner("minValue").requireValue(670L)
-                frame.spinner("maxValue").requireValue(670L)
+                frame.spinner("minValue").requireValue(3670.0)
+                frame.spinner("maxValue").requireValue(3670.0)
             }
         }
 
@@ -98,13 +98,13 @@ object DecimalSchemeEditorTest : FunSpec({
                     row(
                         { frame.spinner("minValue").valueProp() },
                         { editor.scheme::minValue.prop() },
-                        189L,
+                        189.0,
                     ),
                 "maxValue" to
                     row(
                         { frame.spinner("maxValue").valueProp() },
                         { editor.scheme::maxValue.prop() },
-                        200L,
+                        200.0,
                     ),
                 "decimalCount" to
                     row(
@@ -116,11 +116,11 @@ object DecimalSchemeEditorTest : FunSpec({
                     row(
                         { frame.checkBox("showTrailingZeroes").isSelectedProp() },
                         { editor.scheme::showTrailingZeroes.prop() },
-                        false,
+                        true,
                     ),
                 "decimalSeparator" to
                     row(
-                        { frame.comboBox("decimalSeparator").itemProp() },
+                        { frame.comboBox("decimalSeparator").textProp() },
                         { editor.scheme::decimalSeparator.prop() },
                         "|",
                     ),
@@ -132,13 +132,13 @@ object DecimalSchemeEditorTest : FunSpec({
                     ),
                 "groupingSeparator" to
                     row(
-                        { frame.comboBox("groupingSeparator").itemProp() },
+                        { frame.comboBox("groupingSeparator").textProp() },
                         { editor.scheme::groupingSeparator.prop() },
                         "/",
                     ),
                 "affixDecorator" to
                     row(
-                        { frame.comboBox("affixDescriptor").itemProp() },
+                        { frame.comboBox("affixDescriptor").textProp() },
                         { editor.scheme.affixDecorator::descriptor.prop() },
                         "[@]",
                     ),
diff --git a/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeTest.kt b/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeTest.kt
index 71d5d1184..77fbf012f 100644
--- a/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/decimal/DecimalSchemeTest.kt
@@ -32,7 +32,10 @@ object DecimalSchemeTest : FunSpec({
                 "adds trailing zeroes" to
                     row(DecimalScheme(decimalCount = 3, showTrailingZeroes = true).withValue(702.78), "702.780"),
                 "uses grouping separator" to
-                    row(DecimalScheme(groupingSeparator = "#").withValue(311_752.11), "311#752.11"),
+                    row(
+                        DecimalScheme(groupingSeparatorEnabled = true, groupingSeparator = "#").withValue(311_752.11),
+                        "311#752.11",
+                    ),
                 "uses no grouping separator if disabled" to
                     row(
                         DecimalScheme(groupingSeparatorEnabled = false, groupingSeparator = "#").withValue(499_935.29),
diff --git a/src/test/kotlin/com/fwdekker/randomness/fixedlength/FixedLengthDecoratorTest.kt b/src/test/kotlin/com/fwdekker/randomness/fixedlength/FixedLengthDecoratorTest.kt
index 7c3776ec8..d7eaf2562 100644
--- a/src/test/kotlin/com/fwdekker/randomness/fixedlength/FixedLengthDecoratorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/fixedlength/FixedLengthDecoratorTest.kt
@@ -24,7 +24,7 @@ object FixedLengthDecoratorTest : FunSpec({
                 "returns shortened string" to
                     row(FixedLengthDecorator(enabled = true, length = 3), "[i0"),
                 "returns padded string" to
-                    row(FixedLengthDecorator(enabled = true, length = 5, filler = "f"), "[i0]f"),
+                    row(FixedLengthDecorator(enabled = true, length = 5, filler = "f"), "f[i0]"),
                 "returns default input if correct length" to
                     row(FixedLengthDecorator(enabled = true, length = 4), "[i0]"),
             )
diff --git a/src/test/kotlin/com/fwdekker/randomness/integer/IntegerSchemeEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/integer/IntegerSchemeEditorTest.kt
index 6c179433a..f454b7463 100644
--- a/src/test/kotlin/com/fwdekker/randomness/integer/IntegerSchemeEditorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/integer/IntegerSchemeEditorTest.kt
@@ -7,8 +7,8 @@ import com.fwdekker.randomness.editorFieldsTestFactory
 import com.fwdekker.randomness.guiGet
 import com.fwdekker.randomness.guiRun
 import com.fwdekker.randomness.isSelectedProp
-import com.fwdekker.randomness.itemProp
 import com.fwdekker.randomness.prop
+import com.fwdekker.randomness.textProp
 import com.fwdekker.randomness.valueProp
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
@@ -70,10 +70,10 @@ object IntegerSchemeEditorTest : FunSpec({
             }
 
             test("binds the minimum and maximum values") {
-                guiRun { frame.spinner("minValue").target().value = 804L }
+                guiRun { frame.spinner("minValue").target().value = 6804L }
 
-                frame.spinner("minValue").requireValue(804L)
-                frame.spinner("maxValue").requireValue(804L)
+                frame.spinner("minValue").requireValue(6804L)
+                frame.spinner("maxValue").requireValue(6804L)
             }
         }
 
@@ -147,13 +147,13 @@ object IntegerSchemeEditorTest : FunSpec({
                     ),
                 "groupingSeparator" to
                     row(
-                        { frame.checkBox("groupingSeparator").isSelectedProp() },
+                        { frame.comboBox("groupingSeparator").textProp() },
                         { editor.scheme::groupingSeparator.prop() },
                         "!",
                     ),
                 "affixDecorator" to
                     row(
-                        { frame.comboBox("affixDescriptor").itemProp() },
+                        { frame.comboBox("affixDescriptor").textProp() },
                         { editor.scheme.affixDecorator::descriptor.prop() },
                         "[@]",
                     ),
diff --git a/src/test/kotlin/com/fwdekker/randomness/integer/IntegerSchemeTest.kt b/src/test/kotlin/com/fwdekker/randomness/integer/IntegerSchemeTest.kt
index 1c695dc84..c21f0057d 100644
--- a/src/test/kotlin/com/fwdekker/randomness/integer/IntegerSchemeTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/integer/IntegerSchemeTest.kt
@@ -41,7 +41,10 @@ object IntegerSchemeTest : FunSpec({
                 "converts to base >10" to
                     row(IntegerScheme(base = 12).withValue(248L), "188"),
                 "uses separator" to
-                    row(IntegerScheme(groupingSeparator = "#").withValue(949_442L), "949#442"),
+                    row(
+                        IntegerScheme(groupingSeparatorEnabled = true, groupingSeparator = "#").withValue(949_442L),
+                        "949#442",
+                    ),
                 "uses no separator if disabled" to
                     row(
                         IntegerScheme(groupingSeparatorEnabled = false, groupingSeparator = "#").withValue(179_644L),
@@ -76,7 +79,7 @@ object IntegerSchemeTest : FunSpec({
                             fixedLengthDecorator = FixedLengthDecorator(enabled = true),
                             arrayDecorator = ArrayDecorator(enabled = true),
                         ).withValue(53L),
-                        "[530L, 530L, 530L]",
+                        "[053L, 053L, 053L]",
                     ),
             )
         ) { (scheme, output) -> scheme.generateStrings()[0] shouldBe output }
diff --git a/src/test/kotlin/com/fwdekker/randomness/string/StringSchemeTest.kt b/src/test/kotlin/com/fwdekker/randomness/string/StringSchemeTest.kt
index 75502929c..c8098f0af 100644
--- a/src/test/kotlin/com/fwdekker/randomness/string/StringSchemeTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/string/StringSchemeTest.kt
@@ -56,13 +56,13 @@ object StringSchemeTest : FunSpec({
                 "removes look-alike characters" to
                     row(StringScheme(pattern = "boiled", removeLookAlikeSymbols = true), "bed"),
                 "removes look-alike characters after interpreting regex" to
-                    row(StringScheme(pattern = "[xi]{4}", removeLookAlikeSymbols = true), "xxxx"),
+                    row(StringScheme(pattern = "[x]{4}[i]{4}", removeLookAlikeSymbols = true), "xxxx"),
                 "returns capitalized string" to
                     row(StringScheme(pattern = "text", capitalization = CapitalizationMode.UPPER), "TEXT"),
                 "returns pattern literally if regex disabled" to
                     row(StringScheme(pattern = "a[bc]d", isRegex = false), "a[bc]d"),
                 "returns reverse-regexed string" to
-                    row(StringScheme(pattern = "[x]{4}"), "xxx"),
+                    row(StringScheme(pattern = "[x]{4}"), "xxxx"),
             )
         ) { (scheme, output) -> scheme.generateStrings()[0] shouldBe output }
     }
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateActionLoaderTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateActionLoaderTest.kt
index a5f236d90..cf8d06534 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateActionLoaderTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateActionLoaderTest.kt
@@ -1,7 +1,5 @@
 package com.fwdekker.randomness.template
 
-import com.fwdekker.randomness.PersistentSettings
-import com.fwdekker.randomness.Settings
 import com.fwdekker.randomness.afterNonContainer
 import com.fwdekker.randomness.beforeNonContainer
 import com.intellij.openapi.actionSystem.ActionManager
@@ -25,6 +23,8 @@ object TemplateActionLoaderTest : FunSpec({
 
     lateinit var ideaFixture: IdeaTestFixture
     lateinit var actionManager: ActionManager
+    lateinit var templates: MutableList<Template>
+    lateinit var loader: TemplateActionLoader
 
 
     beforeNonContainer {
@@ -32,6 +32,8 @@ object TemplateActionLoaderTest : FunSpec({
         ideaFixture.setUp()
 
         actionManager = ActionManager.getInstance()
+        templates = mutableListOf()
+        loader = TemplateActionLoader { templates }
     }
 
     afterNonContainer {
@@ -42,9 +44,9 @@ object TemplateActionLoaderTest : FunSpec({
     context("registerActions") {
         test("registers multiple insert action variants and a settings action") {
             val template = Template()
-            PersistentSettings.default.loadState(Settings(TemplateList(mutableListOf(template))))
+            templates += template
 
-            TemplateActionLoader().registerActions(actionManager)
+            loader.registerActions(actionManager)
 
             val actions = actionManager.getActionsWithPrefix(template.actionId)
             actions.filterIsInstance<TemplateInsertAction>() shouldHaveAtLeastSize 2
@@ -54,9 +56,9 @@ object TemplateActionLoaderTest : FunSpec({
         test("registers actions for each template") {
             val template1 = Template()
             val template2 = Template()
-            PersistentSettings.default.loadState(Settings(TemplateList(mutableListOf(template1, template2))))
+            templates += listOf(template1, template2)
 
-            TemplateActionLoader().registerActions(actionManager)
+            loader.registerActions(actionManager)
 
             actionManager.getActionsWithPrefix(template1.actionId) shouldNot beEmpty()
             actionManager.getActionsWithPrefix(template2.actionId) shouldNot beEmpty()
@@ -66,10 +68,10 @@ object TemplateActionLoaderTest : FunSpec({
     context("unregisterActions") {
         test("unregisters actions for each template") {
             val template = Template()
-            PersistentSettings.default.loadState(Settings(TemplateList(mutableListOf(template))))
-            TemplateActionLoader().registerActions(actionManager)
+            templates += template
+            loader.registerActions(actionManager)
 
-            TemplateActionLoader().unregisterActions(actionManager)
+            loader.unregisterActions(actionManager)
 
             actionManager.getActionsWithPrefix(template.actionId) should beEmpty()
         }
@@ -79,18 +81,18 @@ object TemplateActionLoaderTest : FunSpec({
         test("registers actions of initial templates") {
             val template = Template()
 
-            TemplateActionLoader().updateActions(emptySet(), setOf(template))
+            loader.updateActions(emptyList(), listOf(template))
 
             actionManager.getActionsWithPrefix(template.actionId) shouldNot beEmpty()
         }
 
         test("registers actions of new templates") {
             val template1 = Template()
-            PersistentSettings.default.loadState(Settings(TemplateList(mutableListOf(template1))))
-            TemplateActionLoader().registerActions(actionManager)
+            templates += template1
+            loader.registerActions(actionManager)
 
             val template2 = Template()
-            TemplateActionLoader().updateActions(setOf(template1), setOf(template1, template2))
+            loader.updateActions(listOf(template1), listOf(template1, template2))
 
             actionManager.getActionsWithPrefix(template1.actionId) shouldNot beEmpty()
             actionManager.getActionsWithPrefix(template2.actionId) shouldNot beEmpty()
@@ -99,10 +101,10 @@ object TemplateActionLoaderTest : FunSpec({
         test("unregisters actions of now-removed templates") {
             val template1 = Template()
             val template2 = Template()
-            PersistentSettings.default.loadState(Settings(TemplateList(mutableListOf(template1, template2))))
-            TemplateActionLoader().registerActions(actionManager)
+            templates += listOf(template1, template2)
+            loader.registerActions(actionManager)
 
-            TemplateActionLoader().updateActions(setOf(template1, template2), emptySet())
+            loader.updateActions(listOf(template1, template2), emptyList())
 
             actionManager.getActionsWithPrefix(template1.actionId) should beEmpty()
             actionManager.getActionsWithPrefix(template2.actionId) should beEmpty()
@@ -110,11 +112,11 @@ object TemplateActionLoaderTest : FunSpec({
 
         test("re-registers actions of updated templates") {
             val template = Template()
-            PersistentSettings.default.loadState(Settings(TemplateList(mutableListOf(template))))
-            TemplateActionLoader().registerActions(actionManager)
+            templates += template
+            loader.registerActions(actionManager)
             val oldActions = actionManager.getActionsWithPrefix(template.actionId)
 
-            TemplateActionLoader().updateActions(setOf(template), emptySet())
+            loader.updateActions(listOf(template), emptyList())
 
             actionManager.getActionsWithPrefix(template.actionId) shouldNotContainAnyOf oldActions
         }
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateActionTests.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateActionTests.kt
index 4e6cc1659..6d70fde10 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateActionTests.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateActionTests.kt
@@ -63,33 +63,26 @@ object TemplateGroupActionTest : FunSpec({
 object TemplateInsertActionTest : FunSpec({
     context("init") {
         context("text and description") {
-            lateinit var template: Template
-
-
-            beforeNonContainer {
-                template = Template("Name")
-            }
-
-
             withData(
+                nameFn = { it.b },
                 listOf(
                     row(
-                        TemplateInsertAction(template),
+                        TemplateInsertAction(Template("Name")),
                         "Name",
                         "Inserts a(n) Name at all carets.",
                     ),
                     row(
-                        TemplateInsertAction(template, array = true),
+                        TemplateInsertAction(Template("Name"), array = true),
                         "Name Array",
                         "Inserts an array of Name at all carets.",
                     ),
                     row(
-                        TemplateInsertAction(template, repeat = true),
+                        TemplateInsertAction(Template("Name"), repeat = true),
                         "Name Repeat",
                         "Inserts the same Name at each caret.",
                     ),
                     row(
-                        TemplateInsertAction(template, array = true, repeat = true),
+                        TemplateInsertAction(Template("Name"), array = true, repeat = true),
                         "Name Repeat Array",
                         "Inserts the same array of Name at each caret.",
                     ),
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateEditorTest.kt
index 8147e8adf..f5aaeea4f 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateEditorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateEditorTest.kt
@@ -2,16 +2,14 @@ package com.fwdekker.randomness.template
 
 import com.fwdekker.randomness.afterNonContainer
 import com.fwdekker.randomness.beforeNonContainer
+import com.fwdekker.randomness.editorFieldsTestFactory
 import com.fwdekker.randomness.guiGet
-import com.fwdekker.randomness.guiRun
 import com.fwdekker.randomness.prop
 import com.fwdekker.randomness.textProp
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
-import io.kotest.data.forAll
 import io.kotest.data.row
 import io.kotest.matchers.shouldBe
-import io.kotest.matchers.shouldNotBe
 import org.assertj.swing.edt.FailOnThreadViolationRepaintManager
 import org.assertj.swing.fixture.Containers
 import org.assertj.swing.fixture.FrameFixture
@@ -48,46 +46,17 @@ object TemplateEditorTest : FunSpec({
     test("'apply' makes no changes by default") {
         val before = editor.scheme.deepCopy(retainUuid = true)
 
-        guiRun { editor.apply() }
+        editor.apply()
 
         before shouldBe editor.scheme
     }
 
-    context("fields") {
-        forAll(
-            //@formatter:off
-            // TODO: Test text trimming
-            row("name", frame.textBox("name").textProp(), editor.scheme::name.prop(), "New Name"),
-            //@formatter:on
-        ) { description, editorProperty, schemeProperty, value ->
-            context(description) {
-                test("`reset` loads the scheme into the editor") {
-                    guiGet { editorProperty.get() } shouldNotBe value
-
-                    schemeProperty.set(value)
-                    guiRun { editor.reset() }
-
-                    guiGet { editorProperty.get() } shouldBe value
-                }
-
-                test("`apply` saves the editor into the scheme") {
-                    schemeProperty.get() shouldNotBe value
-
-                    guiRun { editorProperty.set(value) }
-                    guiRun { editor.apply() }
-
-                    schemeProperty.get() shouldBe value
-                }
-
-                test("`addChangeListener` invokes the change listener") {
-                    var invoked = 0
-                    editor.addChangeListener { invoked++ }
-
-                    guiRun { editorProperty.set(value) }
-
-                    invoked shouldBe 1
-                }
-            }
-        }
-    }
+    include(
+        editorFieldsTestFactory(
+            { editor },
+            mapOf(
+                "name" to row({ frame.textBox("templateName").textProp() }, { editor.scheme::name.prop() }, "New Name"),
+            )
+        )
+    )
 })
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeModelTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeModelTest.kt
index 4de0ec034..7dbc494fd 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeModelTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeModelTest.kt
@@ -10,6 +10,7 @@ import com.fwdekker.randomness.shouldContainExactly
 import com.fwdekker.randomness.ui.SimpleTreeModelListener
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.FunSpec
+import io.kotest.data.Row2
 import io.kotest.data.Row3
 import io.kotest.data.row
 import io.kotest.datatest.withData
@@ -61,28 +62,40 @@ object TemplateJTreeModelTest : FunSpec({
 
     context("rowToNode (default implementation)") {
         withData(
-            mapOf(
-                "negative index" to row(-2, null),
-                "too-high index" to row(241, null),
-                "0 is first template" to row(0, model.root.children[0]),
-                "1 is first leaf" to row(1, model.root.children[0].children[0]),
-                "row number for template includes siblings' schemes" to row(5, model.root.children[2]),
-                "row number for scheme includes aunts'/uncles' schemes" to row(4, model.root.children[1].children[0]),
+            mapOf<String, Row2<Int, () -> StateNode?>>(
+                "negative index" to
+                    row(-2) { null },
+                "too-high index" to
+                    row(241) { null },
+                "0 is first template" to
+                    row(0) { model.root.children[0] },
+                "1 is first leaf" to
+                    row(1) { model.root.children[0].children[0] },
+                "row number for template includes siblings' schemes" to
+                    row(5) { model.root.children[2] },
+                "row number for scheme includes aunts'/uncles' schemes" to
+                    row(4) { model.root.children[1].children[0] },
             )
-        ) { (row, node) -> model.rowToNode(row) shouldBe node }
+        ) { (row, node) -> model.rowToNode(row) shouldBe node() }
     }
 
     context("nodeToRow (default implementation)") {
         withData(
-            mapOf(
-                "null" to row(null, -1),
-                "unknown node" to row(StateNode(DummyScheme()), -1),
-                "first template is 0" to row(model.root.children[0], 0),
-                "first scheme is 1" to row(model.root.children[0].children[0], 1),
-                "row number for template includes siblings' schemes" to row(model.root.children[2], 5),
-                "row number for scheme includes aunts'/uncles' schemes" to row(model.root.children[1].children[0], 4),
+            mapOf<String, Row2<() -> StateNode?, Int>>(
+                "null" to
+                    row({ null }, -1),
+                "unknown node" to
+                    row({ StateNode(DummyScheme()) }, -1),
+                "first template is 0" to
+                    row({ model.root.children[0] }, 0),
+                "first scheme is 1" to
+                    row({ model.root.children[0].children[0] }, 1),
+                "row number for template includes siblings' schemes" to
+                    row({ model.root.children[2] }, 5),
+                "row number for scheme includes aunts'/uncles' schemes" to
+                    row({ model.root.children[1].children[0] }, 4),
             )
-        ) { (node, row) -> model.nodeToRow(node) shouldBe row }
+        ) { (node, row) -> model.nodeToRow(node()) shouldBe row }
     }
 
 
@@ -117,14 +130,14 @@ object TemplateJTreeModelTest : FunSpec({
 
     context("addRow") {
         test("throws an error") {
-            shouldThrow<NotImplementedError> { model.addRow() }
+            shouldThrow<UnsupportedOperationException> { model.addRow() }
                 .message should matchBundle("template_list.error.add_empty_row")
         }
     }
 
     context("removeRow") {
         test("throws an error") {
-            shouldThrow<NotImplementedError> { model.removeRow(4) }
+            shouldThrow<UnsupportedOperationException> { model.removeRow(4) }
                 .message should matchBundle("template_list.error.remove_row_by_index")
         }
     }
@@ -142,12 +155,6 @@ object TemplateJTreeModelTest : FunSpec({
 
                 model.list.templates.names() shouldContainExactly listOf("Template1", "Template0", "Template2")
             }
-
-            test("swaps a template with the second-next template") {
-                model.exchangeRows(0, 5)
-
-                model.list.templates.names() shouldContainExactly listOf("Template2", "Template0", "Template1")
-            }
         }
 
         context("schemes") {
@@ -176,13 +183,6 @@ object TemplateJTreeModelTest : FunSpec({
                 model.list.templates[1].schemes should beEmpty()
                 model.list.templates[2].schemes.names() shouldContainExactly listOf("Scheme2")
             }
-
-            test("moves a scheme to a scheme in another template") {
-                model.exchangeRows(1, 4)
-
-                model.list.templates[0].schemes.names() shouldContainExactly listOf("Scheme2", "Scheme1")
-                model.list.templates[1].schemes.names() shouldContainExactly listOf("Scheme0")
-            }
         }
     }
 
@@ -265,25 +265,23 @@ object TemplateJTreeModelTest : FunSpec({
         }
 
         withData(
-            mapOf(
+            mapOf<String, Row3<() -> StateNode?, () -> StateNode?, Int>>(
                 "parent is null" to
-                    row(null, model.root.children[1].children[0], -1),
+                    row({ null }, { model.root.children[1].children[0] }, -1),
                 "child is null" to
-                    row(model.root.children[1], null, -1),
-                "parent is infertile" to
-                    row(model.root.children[1].children[0], model.root.children[0].children[0], -1),
+                    row({ model.root.children[1] }, { null }, -1),
                 "parent is not child's parent" to
-                    row(model.root.children[1], model.root.children[0].children[1], -1),
+                    row({ model.root.children[1] }, { model.root.children[0].children[1] }, -1),
                 "parent is child's parent" to
-                    row(model.root.children[1], model.root.children[1].children[0], 0),
+                    row({ model.root.children[1] }, { model.root.children[1].children[0] }, 0),
                 "parent looks at UUID for matching" to
                     row(
-                        model.root.children[0],
-                        StateNode(model.list.templates[0].schemes[1].deepCopy(retainUuid = true)),
+                        { model.root.children[0] },
+                        { StateNode(model.list.templates[0].schemes[1].deepCopy(retainUuid = true)) },
                         1,
                     ),
             )
-        ) { (parent, child, expected) -> model.getIndexOfChild(parent, child) shouldBe expected }
+        ) { (parent, child, expected) -> model.getIndexOfChild(parent(), child()) shouldBe expected }
     }
 
     context("getParentOf") {
@@ -293,12 +291,12 @@ object TemplateJTreeModelTest : FunSpec({
         }
 
         withData(
-            mapOf(
-                "parent of root" to row(model.root, null),
-                "parent of template" to row(model.root.children[0], model.root),
-                "parent of scheme" to row(model.root.children[1].children[0], model.root.children[1]),
+            mapOf<String, Row2<() -> StateNode, () -> StateNode?>>(
+                "parent of root" to row({ model.root }, { null }),
+                "parent of template" to row({ model.root.children[0] }, { model.root }),
+                "parent of scheme" to row({ model.root.children[1].children[0] }, { model.root.children[1] }),
             )
-        ) { (node, expected) -> model.getParentOf(node) shouldBe expected }
+        ) { (node, expected) -> model.getParentOf(node()) shouldBe expected() }
     }
 
     context("getPathToRoot") {
@@ -310,16 +308,16 @@ object TemplateJTreeModelTest : FunSpec({
         withData(
             mapOf(
                 "path to root" to
-                    row(model.root, arrayOf(model.root)),
+                    row({ model.root }, { arrayOf(model.root) }),
                 "path to template" to
-                    row(model.root.children[0], arrayOf(model.root, model.root.children[0])),
+                    row({ model.root.children[0] }, { arrayOf(model.root, model.root.children[0]) }),
                 "path to scheme" to
                     row(
-                        model.root.children[1].children[0],
-                        arrayOf(model.root, model.root.children[1], model.root.children[1].children[0]),
+                        { model.root.children[1].children[0] },
+                        { arrayOf(model.root, model.root.children[1], model.root.children[1].children[0]) },
                     ),
             )
-        ) { (node, expected) -> model.getParentOf(node) shouldBe expected }
+        ) { (node, expected) -> model.getPathToRoot(node()).path shouldBe expected() }
     }
 
 
@@ -346,10 +344,10 @@ object TemplateJTreeModelTest : FunSpec({
         test("inserts a node at the last index of the parent") {
             val node = StateNode(Template("Template3"))
 
-            model.insertNode(model.root, node, index = 2)
+            model.insertNode(model.root, node, index = 3)
 
             model.root.children shouldHaveSize 4
-            model.root.children[2] shouldBe node
+            model.root.children[3] shouldBe node
             model.list.templates.names() shouldContainExactly listOf("Template0", "Template1", "Template2", "Template3")
         }
 
@@ -362,7 +360,7 @@ object TemplateJTreeModelTest : FunSpec({
             model.insertNode(model.root.children[0], scheme)
 
             lastEvent!!.treePath.lastPathComponent shouldBe model.root.children[0]
-            lastEvent!!.childIndices shouldContainExactly arrayOf(0)
+            lastEvent!!.childIndices shouldContainExactly arrayOf(2)
             lastEvent!!.children shouldContainExactly arrayOf(scheme)
         }
 
@@ -599,7 +597,8 @@ object TemplateJTreeModelTest : FunSpec({
 
     context("valueForPathChanged") {
         test("throws an error") {
-            shouldThrow<NotImplementedError> { model.valueForPathChanged(model.getPathToRoot(model.root), "dirt") }
+            val rootPath = model.getPathToRoot(model.root)
+            shouldThrow<UnsupportedOperationException> { model.valueForPathChanged(rootPath, "dirt") }
                 .message should matchBundle("template_list.error.change_value_by_path")
         }
     }
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeTest.kt
index e9b0a3c50..dcc8af2b9 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeTest.kt
@@ -16,6 +16,7 @@ import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
+import io.kotest.data.Row3
 import io.kotest.data.row
 import io.kotest.datatest.withData
 import io.kotest.matchers.collections.shouldContainExactly
@@ -24,6 +25,7 @@ import io.kotest.matchers.nulls.beNull
 import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
+import io.kotest.matchers.types.shouldBeSameInstanceAs
 import io.kotest.matchers.types.shouldNotBeSameInstanceAs
 import org.assertj.swing.edt.FailOnThreadViolationRepaintManager
 import org.assertj.swing.fixture.Containers.showInFrame
@@ -39,8 +41,8 @@ object TemplateJTreeTest : FunSpec({
 
     lateinit var ideaFixture: IdeaTestFixture
 
-    lateinit var originalState: Settings
-    lateinit var currentState: Settings
+    lateinit var originalSettings: Settings
+    lateinit var currentSettings: Settings
     lateinit var tree: TemplateJTree
 
     fun List<Scheme>.names() = this.map { it.name }
@@ -54,7 +56,7 @@ object TemplateJTreeTest : FunSpec({
         ideaFixture = IdeaTestFixtureFactory.getFixtureFactory().createBareFixture()
         ideaFixture.setUp()
 
-        originalState =
+        originalSettings =
             Settings(
                 TemplateList(
                     mutableListOf(
@@ -64,10 +66,10 @@ object TemplateJTreeTest : FunSpec({
                     )
                 )
             )
-        originalState.applyContext(originalState)
-        currentState = originalState.deepCopy(retainUuid = true)
+        originalSettings.applyContext(originalSettings)
+        currentSettings = originalSettings.deepCopy(retainUuid = true)
 
-        tree = guiGet { TemplateJTree(originalState, currentState) }
+        tree = guiGet { TemplateJTree(originalSettings, currentSettings) }
     }
 
     afterNonContainer {
@@ -177,12 +179,12 @@ object TemplateJTreeTest : FunSpec({
                 tree.selectedTemplate should beNull()
             }
 
-            test("returns null if a non-template scheme is selected") {
-                val scheme = tree.myModel.list.templates[1].schemes[0]
+            test("returns the parent template if a non-template scheme is selected") {
+                val scheme = tree.myModel.list.templates[2].schemes[0]
 
                 guiRun { tree.selectionPath = tree.myModel.getPathToRoot(StateNode(scheme)) }
 
-                tree.selectedTemplate shouldBe scheme
+                tree.selectedTemplate shouldBe tree.myModel.list.templates[2]
             }
 
             test("returns the selected template otherwise") {
@@ -229,7 +231,7 @@ object TemplateJTreeTest : FunSpec({
 
             guiRun { tree.reload() }
 
-            guiGet { tree.rowCount } shouldBe 5
+            guiGet { tree.rowCount } shouldBe 3
         }
 
         test("synchronizes added nodes") {
@@ -292,8 +294,8 @@ object TemplateJTreeTest : FunSpec({
 
             guiRun { tree.reload() }
 
-            guiGet { tree.myModel.rowToNode(5)!!.state } shouldBe template
-            guiGet { tree.isExpanded(5) } shouldBe true
+            guiGet { tree.myModel.rowToNode(8)!!.state } shouldBe template
+            guiGet { tree.isExpanded(8) } shouldBe true
         }
     }
 
@@ -403,7 +405,7 @@ object TemplateJTreeTest : FunSpec({
         test("removes the given node from the tree") {
             guiRun { tree.removeScheme(tree.myModel.list.templates[1]) }
 
-            tree.myModel.list.templates.names() shouldContainExactly listOf("Template0", "Template1")
+            tree.myModel.list.templates.names() shouldContainExactly listOf("Template0", "Template2")
         }
 
         test("removes the selection if there is nothing to select") {
@@ -441,9 +443,12 @@ object TemplateJTreeTest : FunSpec({
         test("expands and selects the moved template") {
             val template = tree.myModel.list.templates[2]
 
+            guiRun { tree.selectedTemplate = template }
             guiRun { tree.moveSchemeByOnePosition(template, moveDown = false) }
 
-            tree.isExpanded(tree.myModel.nodeToRow(StateNode(template))) shouldBe true
+            val row = tree.myModel.nodeToRow(StateNode(template))
+            guiGet { tree.isExpanded(row) } shouldBe true // The `guiGet` is required
+            tree.isRowSelected(row) shouldBe true
         }
 
         test("selects the moved scheme") {
@@ -458,16 +463,16 @@ object TemplateJTreeTest : FunSpec({
     context("canMoveSchemeByOnePosition") {
         @Suppress("BooleanLiteralArgument") // Argument names clear from lambda later on
         withData(
-            mapOf(
-                "first template" to row(tree.myModel.list.templates[0], false, false),
-                "first scheme" to row(tree.myModel.list.templates[0].schemes[0], false, false),
-                "last template" to row(tree.myModel.list.templates[2], true, false),
-                "last scheme" to row(tree.myModel.list.templates[2].schemes[1], true, false),
-                "move scheme within template" to row(tree.myModel.list.templates[0].schemes[1], false, true),
-                "move templates within list" to row(tree.myModel.list.templates[1], true, true),
-                "move scheme between templates" to row(tree.myModel.list.templates[1].schemes[0], true, true),
+            mapOf<String, Row3<() -> Scheme, Boolean, Boolean>>(
+                "first template" to row({ tree.myModel.list.templates[0] }, false, false),
+                "first scheme" to row({ tree.myModel.list.templates[0].schemes[0] }, false, false),
+                "last template" to row({ tree.myModel.list.templates[2] }, true, false),
+                "last scheme" to row({ tree.myModel.list.templates[2].schemes[1] }, true, false),
+                "move scheme within template" to row({ tree.myModel.list.templates[0].schemes[1] }, false, true),
+                "move templates within list" to row({ tree.myModel.list.templates[1] }, true, true),
+                "move scheme between templates" to row({ tree.myModel.list.templates[1].schemes[0] }, true, true),
             )
-        ) { (scheme, moveDown, expected) -> tree.canMoveSchemeByOnePosition(scheme, moveDown) shouldBe expected }
+        ) { (scheme, moveDown, expected) -> tree.canMoveSchemeByOnePosition(scheme(), moveDown) shouldBe expected }
     }
 
 
@@ -539,29 +544,28 @@ object TemplateJTreeTest : FunSpec({
 
             test("ensures the copy uses the same settings state") {
                 // Arrange
-                val referredTemplate = tree.myModel.list.templates[0]
-                val referenceScheme = TemplateReference(referredTemplate.uuid)
-                val referenceTemplate = Template(schemes = mutableListOf(referenceScheme))
-                    .also { it.applyContext(originalState) }
+                val referencedTemplate = tree.myModel.list.templates[0]
+                val referencingScheme = TemplateReference(referencedTemplate.uuid)
+                val referencingTemplate = Template(schemes = mutableListOf(referencingScheme))
+                    .also { it.applyContext(currentSettings) }
 
-                originalState.templates += referenceTemplate
-                originalState.applyContext(originalState)
+                currentSettings.templates += referencingTemplate
+                currentSettings.applyContext(currentSettings)
 
                 guiRun { tree.reload() }
-                tree.myModel.list.templates.last() shouldBe referenceTemplate
+                tree.myModel.list.templates.last() shouldBe referencingTemplate
 
                 // Act
                 guiRun {
-                    tree.selectedScheme = tree.myModel.list.templates[1].schemes[0]
+                    tree.selectedScheme = tree.myModel.list.templates[3].schemes[0]
                     frame.getActionButton("Copy").click()
                 }
 
                 // Assert
                 val selectedScheme = tree.selectedScheme!! as TemplateReference
-                selectedScheme shouldBe referenceScheme
-                selectedScheme shouldNotBeSameInstanceAs referenceScheme
-                selectedScheme.template!! shouldBe referredTemplate
-                selectedScheme.template shouldNotBeSameInstanceAs referredTemplate
+                selectedScheme shouldBe referencingScheme
+                selectedScheme shouldNotBeSameInstanceAs referencingScheme
+                selectedScheme.template shouldBeSameInstanceAs referencedTemplate
             }
         }
 
@@ -661,6 +665,7 @@ object TemplateJTreeTest : FunSpec({
             test("removes the scheme if it was newly added") {
                 val template = Template("New Template")
                 tree.myModel.list.templates += template
+                guiRun { tree.reload() }
 
                 guiRun {
                     tree.selectedScheme = template
@@ -672,6 +677,7 @@ object TemplateJTreeTest : FunSpec({
 
             test("resets changes to the initially selected scheme") {
                 (tree.myModel.list.templates[0].schemes[0] as DummyScheme).name = "New Name"
+                guiRun { tree.reload() }
 
                 guiRun { frame.getActionButton("Reset").click() }
 
@@ -680,6 +686,7 @@ object TemplateJTreeTest : FunSpec({
 
             test("resets changes to a template") {
                 tree.myModel.list.templates[0].name = "New Name"
+                guiRun { tree.reload() }
 
                 guiRun {
                     tree.selectedScheme = tree.myModel.list.templates[0]
@@ -691,9 +698,10 @@ object TemplateJTreeTest : FunSpec({
 
             test("resets changes to a scheme") {
                 (tree.myModel.list.templates[1].schemes[0] as DummyScheme).name = "New Name"
+                guiRun { tree.reload() }
 
                 guiRun {
-                    tree.selectedScheme = tree.myModel.list.templates[0].schemes[0]
+                    tree.selectedScheme = tree.myModel.list.templates[1].schemes[0]
                     frame.getActionButton("Reset").click()
                 }
 
@@ -702,7 +710,7 @@ object TemplateJTreeTest : FunSpec({
 
             test("resets a template's scheme order") {
                 tree.myModel.list.templates[0].schemes.setAll(tree.myModel.list.templates[0].schemes.reversed())
-                // TODO: Add `tree.reload()`s back in?
+                guiRun { tree.reload() }
 
                 guiRun {
                     tree.selectedScheme = tree.myModel.list.templates[0]
@@ -714,6 +722,7 @@ object TemplateJTreeTest : FunSpec({
 
             test("resets a template's schemes") {
                 (tree.myModel.list.templates[2].schemes[0] as DummyScheme).name = "New Name"
+                guiRun { tree.reload() }
 
                 guiRun {
                     tree.selectedScheme = tree.myModel.list.templates[2]
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceEditorTest.kt
index 8049d1d41..e4b170542 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceEditorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceEditorTest.kt
@@ -10,6 +10,7 @@ import com.fwdekker.randomness.guiGet
 import com.fwdekker.randomness.guiRun
 import com.fwdekker.randomness.itemProp
 import com.fwdekker.randomness.prop
+import com.fwdekker.randomness.textProp
 import com.fwdekker.randomness.valueProp
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
@@ -37,6 +38,8 @@ object TemplateReferenceEditorTest : FunSpec({
     lateinit var reference: TemplateReference
     lateinit var editor: TemplateReferenceEditor
 
+    val theTemplate = Template("Template2", mutableListOf(DummyScheme())) // TODO: Rename this field (I was drunk)
+
 
     beforeContainer {
         FailOnThreadViolationRepaintManager.install()
@@ -51,7 +54,7 @@ object TemplateReferenceEditorTest : FunSpec({
                 mutableListOf(
                     Template("Template0", mutableListOf(DummyScheme())),
                     Template("Template1", mutableListOf(TemplateReference())),
-                    Template("Template2", mutableListOf(DummyScheme()))
+                    theTemplate,
                 )
             )
         )
@@ -75,7 +78,7 @@ object TemplateReferenceEditorTest : FunSpec({
             reference.template = null
             guiRun { editor.reset() }
 
-            guiRun { frame.comboBox("template").itemProp().get() } shouldBe null
+            guiGet { frame.comboBox("template").itemProp().get() } shouldBe null
         }
 
         test("does not load the reference's parent as a selectable option") {
@@ -90,7 +93,7 @@ object TemplateReferenceEditorTest : FunSpec({
         test("makes no changes by default") {
             val before = editor.scheme.deepCopy(retainUuid = true)
 
-            guiRun { editor.apply() }
+            editor.apply()
 
             before shouldBe editor.scheme
         }
@@ -104,7 +107,7 @@ object TemplateReferenceEditorTest : FunSpec({
                     row(
                         { frame.comboBox("template").itemProp() },
                         { editor.scheme::template.prop() },
-                        "Template0",
+                        theTemplate,
                     ),
                 "capitalization" to
                     row(
@@ -114,7 +117,7 @@ object TemplateReferenceEditorTest : FunSpec({
                     ),
                 "affixDecorator" to
                     row(
-                        { frame.comboBox("affixDescriptor").itemProp() },
+                        { frame.comboBox("affixDescriptor").textProp() },
                         { editor.scheme.affixDecorator::descriptor.prop() },
                         "[@]",
                     ),
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceTest.kt
index 52b96f805..402e05ac5 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateReferenceTest.kt
@@ -184,8 +184,8 @@ object TemplateReferenceTest : FunSpec({
         }
     }
 
-    context("canReference") {
-        TODO() // TODO: Implement these tests
+    xcontext("canReference") {
+        TODO() // TODO: Add these tests
     }
 
 
@@ -193,16 +193,16 @@ object TemplateReferenceTest : FunSpec({
         withData(
             mapOf(
                 "returns the referenced template's value" to
-                    row(reference, "text0"),
+                    row({ reference }, "text0"),
                 "capitalizes output" to
-                    row(reference.also { it.capitalization = CapitalizationMode.UPPER }, "DUMMY0"),
+                    row({ reference.also { it.capitalization = CapitalizationMode.UPPER } }, "TEXT0"),
                 "applies decorators in order affix, array" to
                     row(
-                        reference.also { it.affixDecorator.enabled = true; it.arrayDecorator.enabled = true },
-                        """["text0", "text1", "text2"]""",
+                        { reference.also { it.affixDecorator.enabled = true; it.arrayDecorator.enabled = true } },
+                        "[text0, text1, text2]",
                     ),
             )
-        ) { (scheme, output) -> scheme.generateStrings()[0] shouldBe output }
+        ) { (scheme, output) -> scheme().generateStrings()[0] shouldBe output }
 
 
         test("returns the referenced template's value") {
@@ -226,26 +226,27 @@ object TemplateReferenceTest : FunSpec({
         withData(
             mapOf(
                 "succeeds for default state (given appropriate context)" to
-                    row(reference, null),
+                    row({ reference }, null),
                 "fails if no template is referred to" to
-                    row(reference.also { it.template = null }, "reference.error.no_selection"),
+                    row({ reference.also { it.template = null } }, "reference.error.no_selection"),
                 "fails if the referred template cannot be found" to
-                    row(reference.also { it.applyContext(Settings()) }, "reference.error.not_found"),
+                    row({ reference.also { it.applyContext(Settings()) } }, "reference.error.not_found"),
                 "fails if the reference is recursive" to
                     row(
-                        run {
-                            referencingTemplate.schemes += TemplateReference(reference.uuid)
-                            referencingTemplate.applyContext(Settings(list))
+                        {
+                            referencedTemplate.schemes +=
+                                TemplateReference(referencingTemplate.uuid).also { it.applyContext(Settings(list)) }
+
                             reference
                         },
                         "reference.error.recursion",
                     ),
                 "fails if affix decorator is invalid" to
-                    row(reference.also { it.affixDecorator.descriptor = """\""" }, ""),
+                    row({ reference.also { it.affixDecorator.descriptor = """\""" } }, ""),
                 "fails if array decorator is invalid" to
-                    row(reference.also { it.arrayDecorator.minCount = -24 }, ""),
+                    row({ reference.also { it.arrayDecorator.minCount = -24 } }, ""),
             )
-        ) { (scheme, validation) -> scheme shouldValidateAsBundle validation }
+        ) { (scheme, validation) -> scheme() shouldValidateAsBundle validation }
     }
 
     include(stateDeepCopyTestFactory { TemplateReference() })
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateTest.kt
index 0ee082fbb..f6b645e3a 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateTest.kt
@@ -73,7 +73,7 @@ object TemplateTest : FunSpec({
     }
 
 
-    test("canReference") {
+    xtest("canReference") {
         TODO() // TODO: Add these tests
     }
 
@@ -87,7 +87,13 @@ object TemplateTest : FunSpec({
                     row(Template(schemes = mutableListOf(DummyScheme())), "text0"),
                 "returns the concatenation of the schemes' outputs" to
                     row(
-                        Template(schemes = mutableListOf(DummyScheme("a"), DummyScheme("b"), DummyScheme("c"))),
+                        Template(
+                            schemes = mutableListOf(
+                                DummyScheme(prefix = "a"),
+                                DummyScheme(prefix = "b"),
+                                DummyScheme(prefix = "c"),
+                            ),
+                        ),
                         "a0b0c0",
                     ),
             )
@@ -107,19 +113,8 @@ object TemplateTest : FunSpec({
                     row(Template(), null),
                 "fails if name is blank" to
                     row(Template("  "), "template.error.no_name"),
-                "fails if only scheme is invalid" to
-                    row(
-                        Template("Template", mutableListOf(DummyScheme(valid = false))),
-                        "Template > DummyScheme is invalid",
-                    ),
-                "fails on the first invalid scheme" to
-                    row(
-                        Template(
-                            "Template",
-                            mutableListOf(DummyScheme(), DummyScheme(valid = false), DummyScheme(valid = false)),
-                        ),
-                        "Template > DummyScheme is invalid",
-                    ),
+                "fails if scheme is invalid" to
+                    row(Template("Template", mutableListOf(DummyScheme(valid = false))), ""),
                 "fails if array decorator is invalid" to
                     row(Template(arrayDecorator = ArrayDecorator(minCount = -24)), ""),
             )
diff --git a/src/test/kotlin/com/fwdekker/randomness/ui/JDateTimeFieldTest.kt b/src/test/kotlin/com/fwdekker/randomness/ui/JDateTimeFieldTest.kt
index 748ab10b7..a2b7ef1be 100644
--- a/src/test/kotlin/com/fwdekker/randomness/ui/JDateTimeFieldTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/ui/JDateTimeFieldTest.kt
@@ -9,10 +9,10 @@ import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
-import io.kotest.matchers.string.shouldStartWith
 import org.assertj.swing.edt.FailOnThreadViolationRepaintManager
 import java.text.ParseException
 import java.time.LocalDateTime
+import java.time.Month
 
 
 /**
@@ -62,15 +62,15 @@ object JDateTimeFieldTest : FunSpec({
 
     context("longValue") {
         test("get") {
-            field.longValue = 2_625_932_560L
+            guiRun { field.value = LocalDateTime.of(1998, Month.SEPTEMBER, 24, 15, 5, 36) }
 
-            field.value shouldBe TODO() // TODO: Add this assertion
+            field.longValue shouldBe 906_649_536_000L
         }
 
         test("set") {
-            field.value = TODO()
+            guiRun { field.longValue = 2_625_932_560L }
 
-            field.longValue shouldBe TODO() // TODO: Add this assertion
+            field.value shouldBe LocalDateTime.of(1970, 1, 31, 9, 25, 32, 560_000_000)
         }
     }
 
@@ -94,30 +94,35 @@ object JDateTimeFieldTest : FunSpec({
         }
 
         test("fails if the text is null") {
-            shouldThrow<ParseException> {
-                guiRun {
+            guiRun {
+                shouldThrow<ParseException> {
                     field.text = null
                     field.commitEdit()
-                }
-            }.message shouldBe Bundle("datetime_field.error.empty_string")
+                }.message shouldBe Bundle("datetime_field.error.empty_string")
+            }
         }
 
         test("fails if the text is empty") {
-            shouldThrow<ParseException> {
-                guiRun {
+            guiRun {
+                shouldThrow<ParseException> {
                     field.text = ""
                     field.commitEdit()
-                }
-            }.message shouldBe Bundle("datetime_field.error.empty_string")
+                }.message shouldBe Bundle("datetime_field.error.empty_string")
+            }
         }
 
-        test("retains the old value if the set text is invalid") {
-            shouldThrow<ParseException> {
-                guiRun {
+        test("clears the old value if the set text is invalid") {
+            guiRun {
+                field.text = "3598-06-25"
+                field.commitEdit()
+
+                shouldThrow<ParseException> {
                     field.text = null
                     field.commitEdit()
                 }
-            }.message shouldStartWith "Text invalid date cannot parse at"
+
+                field.text shouldBe ""
+            }
         }
     }
 })
diff --git a/src/test/kotlin/com/fwdekker/randomness/ui/ListenerHelperTest.kt b/src/test/kotlin/com/fwdekker/randomness/ui/ListenerHelperTest.kt
index 39f701fa7..eceb7fe16 100644
--- a/src/test/kotlin/com/fwdekker/randomness/ui/ListenerHelperTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/ui/ListenerHelperTest.kt
@@ -1,14 +1,10 @@
 package com.fwdekker.randomness.ui
 
 import com.fwdekker.randomness.DummySchemeEditor
-import com.fwdekker.randomness.afterNonContainer
 import com.fwdekker.randomness.beforeNonContainer
 import com.fwdekker.randomness.guiGet
 import com.fwdekker.randomness.guiRun
-import com.intellij.openapi.editor.EditorFactory
 import com.intellij.openapi.ui.ComboBox
-import com.intellij.testFramework.fixtures.IdeaTestFixture
-import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import com.intellij.ui.dsl.builder.panel
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
@@ -28,18 +24,15 @@ import javax.swing.text.PlainDocument
 import javax.swing.tree.DefaultMutableTreeNode
 import javax.swing.tree.DefaultTreeModel
 import javax.swing.tree.MutableTreeNode
-import com.intellij.openapi.editor.Document as JBDocument
 
 
 /**
  * Unit tests for extension functions in `ListenerHelperKt`.
  */
 object ListenerHelperTest : FunSpec({
-    tags(NamedTag("IdeaFixture"), NamedTag("Swing"))
+    tags(NamedTag("Swing"))
 
 
-    lateinit var ideaFixture: IdeaTestFixture
-
     var listenerInvoked = false
     val listener = { listenerInvoked = true }
 
@@ -49,16 +42,9 @@ object ListenerHelperTest : FunSpec({
     }
 
     beforeNonContainer {
-        ideaFixture = IdeaTestFixtureFactory.getFixtureFactory().createBareFixture()
-        ideaFixture.setUp()
-
         listenerInvoked = false
     }
 
-    afterNonContainer {
-        ideaFixture.tearDown()
-    }
-
 
     context("addChangeListenerTo") {
         withData(
@@ -72,7 +58,7 @@ object ListenerHelperTest : FunSpec({
                 "AbstractButton: JRadioButton: Change selection" to
                     row(
                         { JRadioButton() },
-                        { (it as JCheckBox).isSelected = true },
+                        { (it as JRadioButton).isSelected = true },
                     ),
                 "Document: Insert text" to
                     row(
@@ -89,26 +75,7 @@ object ListenerHelperTest : FunSpec({
                         { PlainDocument().also { it.insertString(0, "text", null) } },
                         { (it as PlainDocument).replace(2, 1, "y", null) },
                     ),
-                "JBDocument: Set text" to
-                    row(
-                        { EditorFactory.getInstance().createDocument("") },
-                        { (it as JBDocument).setText("text") },
-                    ),
-                "JBDocument: Insert text" to
-                    row(
-                        { EditorFactory.getInstance().createDocument("text") },
-                        { (it as JBDocument).insertString(1, "text") },
-                    ),
-                "JBDocument: Remove text" to
-                    row(
-                        { EditorFactory.getInstance().createDocument("text") },
-                        { (it as JBDocument).deleteString(2, 3) },
-                    ),
-                "JBDocument: Replace text" to
-                    row(
-                        { EditorFactory.getInstance().createDocument("text") },
-                        { (it as JBDocument).replaceString(0, 2, "text") },
-                    ),
+                // JBDocument cannot easily be tested; fixtures are difficult
                 "JComboBox: Select different item" to
                     row(
                         { ComboBox(arrayOf("item1", "item2")) },
@@ -142,11 +109,11 @@ object ListenerHelperTest : FunSpec({
                 "JTextComponent: Insert text" to
                     row(
                         { JTextField() },
-                        { (it as JTextField).document.insertString(1, "text", null) },
+                        { (it as JTextField).document.insertString(0, "text", null) },
                     ),
                 "JTextComponent: Remove text" to
                     row(
-                        { JTextField() },
+                        { JTextField("text") },
                         { (it as JTextField).document.remove(2, 2) },
                     ),
                 "JTree: Change selection" to
@@ -166,7 +133,7 @@ object ListenerHelperTest : FunSpec({
                     ),
                 "SchemeEditor: Recursion" to
                     row(
-                        { DummySchemeEditor { panel { row { textField() } } } },
+                        { DummySchemeEditor { panel { row { textField().withName("text") } } } },
                         { ((it as DummySchemeEditor).components.first() as JTextField).text = "text" },
                     ),
             )
diff --git a/src/test/kotlin/com/fwdekker/randomness/uuid/UuidSchemeEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/uuid/UuidSchemeEditorTest.kt
index 12a7ea220..c4b9b4781 100644
--- a/src/test/kotlin/com/fwdekker/randomness/uuid/UuidSchemeEditorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/uuid/UuidSchemeEditorTest.kt
@@ -6,11 +6,12 @@ import com.fwdekker.randomness.editorApplyTestFactory
 import com.fwdekker.randomness.editorFieldsTestFactory
 import com.fwdekker.randomness.guiGet
 import com.fwdekker.randomness.isSelectedProp
-import com.fwdekker.randomness.itemProp
 import com.fwdekker.randomness.prop
+import com.fwdekker.randomness.textProp
 import com.fwdekker.randomness.valueProp
 import com.intellij.testFramework.fixtures.IdeaTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
+import com.intellij.ui.dsl.builder.MutableProperty
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.data.row
@@ -60,34 +61,44 @@ object UuidSchemeEditorTest : FunSpec({
             mapOf(
                 "type" to
                     row(
-                        { frame.spinner("type").valueProp() },
-                        // TODO: Fix `editorProperty` for button group
+                        {
+                            MutableProperty(
+                                {
+                                    when {
+                                        frame.radioButton("type1").target().isSelected -> 1
+                                        frame.radioButton("type4").target().isSelected -> 4
+                                        else -> error("No radio button was selected.")
+                                    }
+                                },
+                                { frame.radioButton("type${it as Int}").target().isSelected = true },
+                            )
+                        },
                         { editor.scheme::type.prop() },
-                        0
+                        1,
                     ),
                 "isUppercase" to
                     row(
                         { frame.checkBox("isUppercase").isSelectedProp() },
                         { editor.scheme::isUppercase.prop() },
-                        true
+                        true,
                     ),
                 "addDashes" to
                     row(
                         { frame.checkBox("addDashes").isSelectedProp() },
                         { editor.scheme::addDashes.prop() },
-                        false
+                        false,
                     ),
                 "affixDecorator" to
                     row(
-                        { frame.comboBox("affixDescriptor").itemProp() },
+                        { frame.comboBox("affixDescriptor").textProp() },
                         { editor.scheme.affixDecorator::descriptor.prop() },
-                        "[@]"
+                        "[@]",
                     ),
                 "arrayDecorator" to
                     row(
                         { frame.spinner("arrayMaxCount").valueProp() },
                         { editor.scheme.arrayDecorator::maxCount.prop() },
-                        7
+                        7,
                     ),
             )
         )
diff --git a/src/test/kotlin/com/fwdekker/randomness/word/WordSchemeEditorTest.kt b/src/test/kotlin/com/fwdekker/randomness/word/WordSchemeEditorTest.kt
index 72068badf..c7e594b75 100644
--- a/src/test/kotlin/com/fwdekker/randomness/word/WordSchemeEditorTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/word/WordSchemeEditorTest.kt
@@ -11,6 +11,7 @@ import com.fwdekker.randomness.guiRun
 import com.fwdekker.randomness.itemProp
 import com.fwdekker.randomness.matcher
 import com.fwdekker.randomness.prop
+import com.fwdekker.randomness.textProp
 import com.fwdekker.randomness.valueProp
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.editor.impl.EditorComponentImpl
@@ -142,7 +143,7 @@ object WordSchemeEditorTest : FunSpec({
             test("removes blank lines from the input field") {
                 guiRun { runWriteAction { wordsEditor.editor.document.setText("word1\n  \nword2\n") } }
 
-                guiRun { editor.apply() }
+                editor.apply()
 
                 guiGet { editor.scheme.words } shouldContainExactly listOf("word1", "word2")
             }
@@ -165,7 +166,7 @@ object WordSchemeEditorTest : FunSpec({
                     ),
                 "affixDecorator" to
                     row(
-                        { frame.comboBox("affixDescriptor").itemProp() },
+                        { frame.comboBox("affixDescriptor").textProp() },
                         { editor.scheme.affixDecorator::descriptor.prop() },
                         "[@]",
                     ),