diff --git a/eo-runtime/src/main/java/org/eolang/Dataized.java b/eo-runtime/src/main/java/org/eolang/Dataized.java
index b5e08f50b16..a44d6d59ed4 100644
--- a/eo-runtime/src/main/java/org/eolang/Dataized.java
+++ b/eo-runtime/src/main/java/org/eolang/Dataized.java
@@ -83,10 +83,10 @@ public byte[] take() {
             raw.addAll(ex.messages());
             Collections.reverse(raw);
             final Phi enc = ex.enclosure();
-            if ("go.to.token.jump".equals(enc.forma())) {
+            if (enc.forma().endsWith("go.to.token.jump")) {
                 throw new EOerror.ExError(enc);
             }
-            if (String.format("%s.string", PhPackage.GLOBAL).equals(enc.forma())) {
+            if (enc.forma().endsWith(".string")) {
                 raw.add(
                     String.format(
                         "\"%s\"",
diff --git a/eo-runtime/src/test/java/org/eolang/DataizedTest.java b/eo-runtime/src/test/java/org/eolang/DataizedTest.java
index a3aa638e4e7..6202628bd56 100644
--- a/eo-runtime/src/test/java/org/eolang/DataizedTest.java
+++ b/eo-runtime/src/test/java/org/eolang/DataizedTest.java
@@ -13,7 +13,6 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -22,20 +21,9 @@
  * Test case for {@link Dataized}.
  *
  * @since 0.22
- * @todo #4538:30min Enable the test {@link DataizedTest#doesNotLogGoToTokenJump}.
- *  The test was disabled because we've moved EO objects from default package 'org.eolang'
- *  to Q, but java classes are placed in 'org.eolang' java package. That's why the method
- *  {@link PhDefault#forma()} and {@link PhSafe#forma()} started to work incorrectly and
- *  show 'org.eolang'. Need to fix these methods, make sure they work as expected and enable
- *  the test.
- * @todo #4538:30min Enable the test {@link DataizedTest#logsAllLocationsWithPhSafe()}.
- *  The test was disabled because we've moved EO objects from default package 'org.eolang'
- *  to Q. This somehow affected {@link PhSafe} and {@link PhDefault} classes.
- *  Need to fix it and enable the test
  */
 @Execution(ExecutionMode.SAME_THREAD)
 final class DataizedTest {
-    @Disabled
     @Test
     @SuppressWarnings({"PMD.UnitTestContainsTooManyAsserts", "PMD.UnnecessaryLocalRule"})
     void logsAllLocationsWithPhSafe() {
@@ -92,7 +80,6 @@ void failsWhenError() {
         );
     }
 
-    @Disabled
     @Test
     @SuppressWarnings({"PMD.UnitTestContainsTooManyAsserts", "PMD.UnnecessaryLocalRule"})
     void doesNotLogGoToTokenJump() {