diff --git a/resources/functionalTests/property/5blocks3/input.p b/resources/functionalTests/property/5blocks3/input.p
index b914607..f1f570a 100644
--- a/resources/functionalTests/property/5blocks3/input.p
+++ b/resources/functionalTests/property/5blocks3/input.p
@@ -6,11 +6,11 @@ class Writer implements IWebRequest:
     define static public property Registry as BuilderRegistry no-undo
         get():
             define variable oRegistry as BuilderRegistry no-undo.
-            if not valid-object(AuthenticationRequestWriterBuilder:Registry) then
             do:
-                assign oRegistry = new BuilderRegistry(get-class(IHttpMessageWriter)).
+                 do transaction:
+                        fun(33).
+                        end.
                 AuthenticationRequestWriterBuilder:InitializeRegistry(oRegistry).                
-                assign AuthenticationRequestWriterBuilder:Registry = oRegistry.
             end.
             return AuthenticationRequestWriterBuilder:Registry.
         end get.
diff --git a/resources/functionalTests/property/5blocks3/target.p b/resources/functionalTests/property/5blocks3/target.p
index aa1d670..eeaf388 100644
--- a/resources/functionalTests/property/5blocks3/target.p
+++ b/resources/functionalTests/property/5blocks3/target.p
@@ -6,15 +6,11 @@ class Writer implements IWebRequest:
     define static public property Registry as BuilderRegistry no-undo
         get():
             define variable oRegistry as BuilderRegistry no-undo.
-            if not valid-object(AuthenticationRequestWriterBuilder:Registry)
-            then do:
-                assign
-                    oRegistry = new BuilderRegistry(get-class(IHttpMessageWriter))
-                    .
+            do:
+                do transaction:
+                    fun(33).
+                end.
                 AuthenticationRequestWriterBuilder:InitializeRegistry(oRegistry).
-                assign
-                    AuthenticationRequestWriterBuilder:Registry = oRegistry
-                    .
             end.
             return AuthenticationRequestWriterBuilder:Registry.
         end get.