diff --git a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java
index 1ff9e68ff88..963fb746cf9 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java
@@ -11,6 +11,7 @@
 
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.AlwaysFalse;
 
 /**
  * Tests the builtin function.
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java
index d1e910b844b..c08e6996809 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java
@@ -11,6 +11,7 @@
 
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.AlwaysTrue;
 
 /**
  * Tests the builtin function.
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/BoolValTest.java b/test/net/sourceforge/plantuml/tim/stdlib/BoolValTest.java
index 3010efbfec4..2742a9e452a 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/BoolValTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/BoolValTest.java
@@ -10,6 +10,7 @@
 
 import net.sourceforge.plantuml.text.StringLocated;
 import net.sourceforge.plantuml.tim.EaterException;
+import net.sourceforge.plantuml.tim.builtin.BoolVal;
 import net.sourceforge.plantuml.tim.expression.TValue;
 
 class BoolValTest {
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java b/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java
index 58cba9f0483..57a7d9ab73c 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java
@@ -9,6 +9,7 @@
 
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.Chr;
 
 /**
  * Tests the builtin function %chr.
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java b/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java
index ff05ebff70c..f1616a0c823 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java
@@ -11,6 +11,7 @@
 
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.Dec2hex;
 
 /**
  * Tests the builtin function.
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java b/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java
index d5ea79e3fb5..5f61dd26059 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java
@@ -14,6 +14,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.Feature;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java
index ab8c23fd376..9d5ca0806e7 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java
@@ -12,6 +12,7 @@
 
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.GetAllStdlib;
 import net.sourceforge.plantuml.tim.expression.TValue;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java
index 1f79076b4cb..8b3db3d90c6 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java
@@ -12,6 +12,7 @@
 
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.GetAllTheme;
 import net.sourceforge.plantuml.tim.expression.TValue;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java
index 269a3aaf3b3..681124d67c8 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java
@@ -14,6 +14,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.GetJsonKey;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java
index 6422fd8de1b..847c82232d1 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java
@@ -14,6 +14,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.GetJsonType;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java
index 883fa0090f5..3171d829e3f 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java
@@ -9,6 +9,7 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 import net.sourceforge.plantuml.tim.EaterException;
+import net.sourceforge.plantuml.tim.builtin.Getenv;
 import net.sourceforge.plantuml.tim.expression.TValue;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java b/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java
index 08a33c4c7f0..b1e074bf852 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java
@@ -11,6 +11,7 @@
 
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.Hex2dec;
 
 /**
  * Tests the builtin function.
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/JsonAddTest.java b/test/net/sourceforge/plantuml/tim/stdlib/JsonAddTest.java
index 54c3f7eef46..15829c2ac2d 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/JsonAddTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/JsonAddTest.java
@@ -14,6 +14,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.JsonAdd;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/JsonKeyExistsTest.java b/test/net/sourceforge/plantuml/tim/stdlib/JsonKeyExistsTest.java
index 1e75ad21c48..4cf7e79fded 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/JsonKeyExistsTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/JsonKeyExistsTest.java
@@ -11,7 +11,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
-
+import net.sourceforge.plantuml.tim.builtin.JsonKeyExists;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/JsonMergeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/JsonMergeTest.java
index 0cda83d8e11..b35a5c3a902 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/JsonMergeTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/JsonMergeTest.java
@@ -14,6 +14,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.JsonMerge;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/JsonRemoveTest.java b/test/net/sourceforge/plantuml/tim/stdlib/JsonRemoveTest.java
index 983255fec74..02ae8456b22 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/JsonRemoveTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/JsonRemoveTest.java
@@ -14,6 +14,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.JsonRemove;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/JsonSetTest.java b/test/net/sourceforge/plantuml/tim/stdlib/JsonSetTest.java
index 1b9e5dd859f..e4edddca1c1 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/JsonSetTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/JsonSetTest.java
@@ -13,6 +13,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.JsonSet;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java b/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java
index 1488eb6417e..20467f24c5c 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java
@@ -14,6 +14,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.Lower;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/ModuloTest.java b/test/net/sourceforge/plantuml/tim/stdlib/ModuloTest.java
index 33def9aaded..045f317ded3 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/ModuloTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/ModuloTest.java
@@ -11,6 +11,7 @@
 
 import net.sourceforge.plantuml.text.StringLocated;
 import net.sourceforge.plantuml.tim.EaterException;
+import net.sourceforge.plantuml.tim.builtin.Modulo;
 import net.sourceforge.plantuml.tim.expression.TValue;
 
 public class ModuloTest {
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java b/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java
index ae2cfcd14c0..fe54e48fa69 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java
@@ -9,6 +9,7 @@
 
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.Ord;
 
 /**
  * Tests the builtin function %ord.
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java b/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java
index fd8033793d9..1b60bfab08c 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java
@@ -13,6 +13,7 @@
 
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.RandomFunction;
 import net.sourceforge.plantuml.tim.expression.TValue;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java
index 1763537baa8..38dbe2ada34 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java
@@ -14,6 +14,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.Size;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/SplitStrRegexTest.java b/test/net/sourceforge/plantuml/tim/stdlib/SplitStrRegexTest.java
index 117422c76f7..0f1beec82cd 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/SplitStrRegexTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/SplitStrRegexTest.java
@@ -11,6 +11,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.SplitStrRegex;
 
 /**
  * Tests the builtin function.
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/SplitStrTest.java b/test/net/sourceforge/plantuml/tim/stdlib/SplitStrTest.java
index bf2be3219e7..7de2b1eb4a9 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/SplitStrTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/SplitStrTest.java
@@ -11,6 +11,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.SplitStr;
 
 /**
  * Tests the builtin function.
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/Str2JsonTest.java b/test/net/sourceforge/plantuml/tim/stdlib/Str2JsonTest.java
index e8dc340b10a..cad2f210d0f 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/Str2JsonTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/Str2JsonTest.java
@@ -13,7 +13,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
-
+import net.sourceforge.plantuml.tim.builtin.Str2Json;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java b/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java
index 5db56f0e975..5e8afa7132a 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java
@@ -14,6 +14,7 @@
 import net.sourceforge.plantuml.json.JsonValue;
 import net.sourceforge.plantuml.tim.EaterException;
 import net.sourceforge.plantuml.tim.TFunction;
+import net.sourceforge.plantuml.tim.builtin.Upper;
 import test.utils.JunitUtils.StringJsonConverter;
 
 /**