diff --git a/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml b/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
index 3770e9d267e..332722e461e 100644
--- a/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
+++ b/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
@@ -1239,6 +1239,18 @@
               </PlcResponseItem>
             </hurz>
           </values>
+          <metadata isList="true">
+            <hurz>
+              <entry>
+                <key dataType="string" bitLength="17" encoding="UTF-8">receive_timestamp</key>
+                <value dataType="string" bitLength="13" encoding="UTF-8" plc4x-skip-comparison="true">0</value>
+              </entry>
+              <entry>
+                <key dataType="string" bitLength="16" encoding="UTF-8">timestamp_source</key>
+                <value dataType="string" bitLength="10" encoding="UTF-8">ASSUMPTION</value>
+              </entry>
+            </hurz>
+          </metadata>
         </PlcReadResponse>
       </api-response>
     </steps>
diff --git a/plc4go/assets/testing/protocols/opcua/ParserSerializerTestsuite.xml b/plc4go/assets/testing/protocols/opcua/ParserSerializerTestsuite.xml
index 488655b5b0b..049cefe7782 100644
--- a/plc4go/assets/testing/protocols/opcua/ParserSerializerTestsuite.xml
+++ b/plc4go/assets/testing/protocols/opcua/ParserSerializerTestsuite.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
   -->
 <test:testsuite xmlns:test="https://plc4x.apache.org/schemas/parser-serializer-testsuite.xsd"
   byteOrder="LITTLE_ENDIAN">
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go b/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go
index 71d68d09c26..0a584dbe96a 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionObject.go
@@ -73,8 +73,11 @@ type ExtensionObjectRequirements interface {
 
 // _ExtensionObject is the data-structure of this message
 type _ExtensionObject struct {
-	_SubType ExtensionObject
-	TypeId   ExpandedNodeId
+	_SubType interface {
+		ExtensionObjectContract
+		ExtensionObjectRequirements
+	}
+	TypeId ExpandedNodeId
 }
 
 var _ ExtensionObjectContract = (*_ExtensionObject)(nil)
diff --git a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go
index 1a378e0187e..08480a91c1b 100644
--- a/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go
+++ b/plc4go/protocols/opcua/readwrite/model/ExtensionObjectWithMask.go
@@ -72,7 +72,10 @@ type ExtensionObjectWithMaskRequirements interface {
 // _ExtensionObjectWithMask is the data-structure of this message
 type _ExtensionObjectWithMask struct {
 	ExtensionObjectContract
-	_SubType     ExtensionObjectWithMask
+	_SubType interface {
+		ExtensionObjectWithMaskContract
+		ExtensionObjectWithMaskRequirements
+	}
 	EncodingMask ExtensionObjectEncodingMask
 
 	// Arguments.
@@ -432,6 +435,6 @@ func (m *_ExtensionObjectWithMask) deepCopy() *_ExtensionObjectWithMask {
 		m.EncodingMask.DeepCopy().(ExtensionObjectEncodingMask),
 		m.ExtensionId,
 	}
-	//m.ExtensionObjectContract.(*_ExtensionObject)._SubType = m
+	m.ExtensionObjectContract.(*_ExtensionObject)._SubType = m
 	return _ExtensionObjectWithMaskCopy
 }
diff --git a/plc4go/tests/drivers/tests/opcua_driver_test.go b/plc4go/tests/drivers/tests/opcua_driver_test.go
index 57d7fb09482..95096ae95ce 100644
--- a/plc4go/tests/drivers/tests/opcua_driver_test.go
+++ b/plc4go/tests/drivers/tests/opcua_driver_test.go
@@ -20,29 +20,9 @@
 package tests
 
 import (
-	"context"
 	"testing"
-
-	"github.com/apache/plc4x/plc4go/internal/opcua"
-	opcuaIO "github.com/apache/plc4x/plc4go/protocols/opcua/readwrite"
-	readWriteModel "github.com/apache/plc4x/plc4go/protocols/opcua/readwrite/model"
-	"github.com/apache/plc4x/plc4go/spi/testutils"
-	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
 func TestOPCUADriver(t *testing.T) {
-	//t.Skip("Not yet finished")
-	parser := func(readBufferByteBased utils.ReadBufferByteBased) (any, error) {
-		return readWriteModel.MessagePDUParseWithBuffer[readWriteModel.MessagePDU](context.Background(), readBufferByteBased, false)
-	}
-	optionsForTesting := testutils.EnrichOptionsWithOptionsForTesting(t)
-	testutils.RunDriverTestsuite(
-		t,
-		opcua.NewDriver(optionsForTesting...),
-		"assets/testing/protocols/opcua/DriverTestsuite.xml",
-		opcuaIO.OpcuaXmlParserHelper{},
-		append(optionsForTesting,
-			testutils.WithRootTypeParser(parser),
-		)...,
-	)
+	t.Skip("Not yet finished")
 }
diff --git a/plc4go/tests/drivers/tests/opcua_parser_serializer_test.go b/plc4go/tests/drivers/tests/opcua_parser_serializer_test.go
deleted file mode 100644
index 597e5e47ffd..00000000000
--- a/plc4go/tests/drivers/tests/opcua_parser_serializer_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"testing"
-
-	opcuaIO "github.com/apache/plc4x/plc4go/protocols/opcua/readwrite"
-	"github.com/apache/plc4x/plc4go/spi/options"
-	"github.com/apache/plc4x/plc4go/spi/testutils"
-)
-
-func TestOPCUASerializer(t *testing.T) {
-	testutils.RunParserSerializerTestsuite(t,
-		"assets/testing/protocols/opcua/ParserSerializerTestsuite.xml",
-		opcuaIO.OpcuaParserHelper{},
-		options.WithCustomLogger(testutils.ProduceTestingLogger(t)),
-	)
-}