You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2026/05/11 07:12:02 UTC

(ws-axiom) branch master updated: Use field injection for OMMetaFactory in SOAP tests

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git


The following commit(s) were added to refs/heads/master by this push:
     new 046c92159 Use field injection for OMMetaFactory in SOAP tests
046c92159 is described below

commit 046c92159b731e0c1e3887938fef3faaf0b0d7c7
Author: Andreas Veithen-Knowles <an...@gmail.com>
AuthorDate: Mon May 11 08:11:21 2026 +0100

    Use field injection for OMMetaFactory in SOAP tests
---
 .../main/java/org/apache/axiom/ts/soap/SOAPTestCase.java    |  6 +-----
 .../org/apache/axiom/ts/soap/SampleBasedSOAPTestCase.java   | 13 ++++++++-----
 .../ts/soap/body/FirstElementNameWithParserTestCase.java    |  5 +++--
 .../java/org/apache/axiom/ts/soap/body/TestAddFault1.java   |  5 ++---
 .../java/org/apache/axiom/ts/soap/body/TestAddFault2.java   |  5 ++---
 .../org/apache/axiom/ts/soap/body/TestCloneOMElement.java   |  5 ++---
 .../java/org/apache/axiom/ts/soap/body/TestGetFault.java    |  5 ++---
 .../apache/axiom/ts/soap/body/TestGetFaultFakeFault.java    |  5 ++---
 .../org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java  |  5 ++---
 .../apache/axiom/ts/soap/body/TestGetFaultWithParser.java   |  5 ++---
 .../axiom/ts/soap/body/TestGetFaultWithParserNoFault.java   |  5 ++---
 .../ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java |  5 ++---
 .../soap/body/TestGetFirstElementLocalNameWithParser.java   |  6 ++----
 .../soap/body/TestGetFirstElementLocalNameWithParser2.java  |  5 ++---
 .../TestGetFirstElementLocalNameWithParserNoLookahead.java  |  6 +++---
 .../axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java  |  5 ++---
 .../axiom/ts/soap/body/TestGetFirstElementNSWithParser.java |  5 ++---
 .../java/org/apache/axiom/ts/soap/body/TestHasFault.java    |  5 ++---
 .../apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java |  5 ++---
 .../apache/axiom/ts/soap/body/TestHasFaultFakeFault.java    |  5 ++---
 .../org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java  |  5 ++---
 .../axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java |  5 ++---
 .../apache/axiom/ts/soap/body/TestHasFaultWithParser.java   |  5 ++---
 .../axiom/ts/soap/body/TestHasFaultWithParserNoFault.java   |  5 ++---
 .../ts/soap/body/TestSerializeWithXSITypeAttribute.java     |  6 ++++--
 .../apache/axiom/ts/soap/builder/TestCommentInEpilog.java   |  5 +++--
 .../apache/axiom/ts/soap/builder/TestCommentInProlog.java   |  6 ++++--
 .../builder/TestCreateSOAPModelBuilderFromDOMSource.java    |  6 ++++--
 .../builder/TestCreateSOAPModelBuilderFromSAXSource.java    |  6 ++++--
 .../TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java  |  7 ++++---
 .../main/java/org/apache/axiom/ts/soap/builder/TestDTD.java |  5 +++--
 .../axiom/ts/soap/builder/TestRegisterCustomBuilder.java    |  6 ++++--
 ...tRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java |  6 ++----
 .../org/apache/axiom/ts/soap/envelope/CloneTestCase.java    |  5 ++---
 .../axiom/ts/soap/envelope/TestAddElementAfterBody.java     |  6 ++----
 .../ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java |  5 ++---
 .../apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java  |  5 ++---
 .../java/org/apache/axiom/ts/soap/envelope/TestClone.java   |  6 ++++--
 .../ts/soap/envelope/TestCloneWithSourcedElement1.java      |  5 ++---
 .../ts/soap/envelope/TestCloneWithSourcedElement2.java      |  5 ++---
 .../java/org/apache/axiom/ts/soap/envelope/TestDetach.java  |  5 ++---
 .../java/org/apache/axiom/ts/soap/envelope/TestGetBody.java |  5 ++---
 .../axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java  |  5 ++---
 .../soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java  |  5 ++---
 .../axiom/ts/soap/envelope/TestGetBodyWithParser.java       |  5 ++---
 .../org/apache/axiom/ts/soap/envelope/TestGetHeader.java    |  5 ++---
 .../axiom/ts/soap/envelope/TestGetHeaderWithParser.java     |  5 ++---
 .../ts/soap/envelope/TestGetHeaderWithParserNoHeader.java   |  5 ++---
 .../axiom/ts/soap/envelope/TestGetOrCreateHeader.java       |  5 ++---
 .../envelope/TestGetOrCreateHeaderWithParserNoHeader.java   |  5 ++---
 .../envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java |  6 ++----
 ...TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java |  6 +++---
 ...amReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java |  6 ++----
 .../org/apache/axiom/ts/soap/envelope/TestHasFault.java     |  5 ++---
 .../axiom/ts/soap/envelope/TestHasFaultWithParser.java      |  5 ++---
 .../envelope/TestSerializeAndConsumeWithOMSEInBody.java     |  5 ++---
 .../apache/axiom/ts/soap/envelope/TestSerializeAsChild.java |  5 ++---
 .../factory/CreateSOAPElementWithoutParentTestCase.java     |  6 ++----
 .../axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java |  5 ++---
 .../apache/axiom/ts/soap/factory/TestCreateSOAPElement.java |  6 ++----
 .../soap/factory/TestCreateSOAPElementWithNullParent.java   |  4 +---
 .../ts/soap/factory/TestCreateSOAPElementWithParent.java    |  4 +---
 .../factory/TestCreateSOAPEnvelopeWithCustomPrefix.java     |  5 ++---
 .../ts/soap/factory/TestCreateSOAPFaultWithException.java   |  5 ++---
 .../factory/TestCreateSOAPHeaderBlockFromOMElement.java     |  5 +++--
 .../axiom/ts/soap/factory/TestFactoryIsSingleton.java       |  6 ++++--
 .../axiom/ts/soap/factory/TestGetDefaultEnvelope.java       |  5 ++---
 .../axiom/ts/soap/factory/TestGetDefaultFaultEnvelope.java  |  5 ++---
 .../apache/axiom/ts/soap/factory/TestGetMetaFactory.java    |  5 +++--
 .../org/apache/axiom/ts/soap/factory/TestGetNamespace.java  |  5 ++---
 .../java/org/apache/axiom/ts/soap/fault/TestChildOrder.java |  4 +---
 .../apache/axiom/ts/soap/fault/TestGetCodeWithParser.java   |  5 ++---
 .../apache/axiom/ts/soap/fault/TestGetDetailWithParser.java |  5 ++---
 .../org/apache/axiom/ts/soap/fault/TestGetException.java    |  5 ++---
 .../apache/axiom/ts/soap/fault/TestGetReasonWithParser.java |  5 ++---
 .../apache/axiom/ts/soap/fault/TestGetRoleWithParser.java   |  5 ++---
 .../org/apache/axiom/ts/soap/fault/TestSetException.java    |  5 ++---
 .../org/apache/axiom/ts/soap/fault/TestWrongParent1.java    |  5 ++---
 .../org/apache/axiom/ts/soap/fault/TestWrongParent2.java    |  5 ++---
 .../org/apache/axiom/ts/soap/fault/TestWrongParent3.java    |  5 ++---
 .../apache/axiom/ts/soap/faultcode/TestGetValueAsQName.java |  5 ++---
 .../ts/soap/faultcode/TestGetValueAsQNameWithParser.java    |  5 ++---
 .../axiom/ts/soap/faultdetail/TestAddDetailEntry.java       |  5 ++---
 .../TestDetailEntriesUsingDefaultNamespaceWithParser.java   |  6 ++----
 .../axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java  |  5 ++---
 .../soap/faultdetail/TestGetAllDetailEntriesWithParser.java |  5 ++---
 .../apache/axiom/ts/soap/faultdetail/TestSerialization.java |  5 ++---
 .../apache/axiom/ts/soap/faultdetail/TestWSCommons202.java  |  5 ++---
 .../axiom/ts/soap/faultnode/TestGetFaultNodeValue.java      |  5 ++---
 .../ts/soap/faultnode/TestGetFaultNodeValueWithParser.java  |  5 ++---
 .../axiom/ts/soap/faultnode/TestSetFaultNodeValue.java      |  5 ++---
 .../axiom/ts/soap/faultreason/TestGetFaultReasonText.java   |  5 ++---
 .../apache/axiom/ts/soap/faultrole/TestGetRoleValue.java    |  5 ++---
 .../axiom/ts/soap/faultrole/TestGetRoleValueWithParser.java |  8 ++++----
 .../apache/axiom/ts/soap/faultrole/TestSetRoleValue.java    |  5 ++---
 .../org/apache/axiom/ts/soap/faulttext/TestGetLang.java     |  5 ++---
 .../axiom/ts/soap/faulttext/TestGetLangFromParser.java      |  8 ++++----
 .../org/apache/axiom/ts/soap/faulttext/TestSetLang.java     |  5 ++---
 .../ts/soap/header/TestAddChildWithPlainOMElement.java      |  5 ++---
 .../org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java |  5 ++---
 .../axiom/ts/soap/header/TestAddHeaderBlockFromQName.java   |  5 ++---
 .../header/TestAddHeaderBlockFromQNameWithoutNamespace.java |  5 ++---
 .../ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java |  5 ++---
 .../ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java |  5 ++---
 .../apache/axiom/ts/soap/header/TestDiscardIncomplete.java  |  5 ++---
 .../axiom/ts/soap/header/TestDiscardPartiallyBuilt.java     |  5 ++---
 .../axiom/ts/soap/header/TestExamineAllHeaderBlocks.java    |  5 ++---
 .../soap/header/TestExamineAllHeaderBlocksWithParser.java   |  5 ++---
 .../axiom/ts/soap/header/TestExamineHeaderBlocks.java       |  5 ++---
 .../ts/soap/header/TestExamineHeaderBlocksWithParser.java   |  5 ++---
 .../TestExamineMustUnderstandHeaderBlocksWithParser.java    |  6 ++----
 .../axiom/ts/soap/header/TestExtractAllHeaderBlocks.java    |  5 ++---
 .../axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java  |  5 ++---
 .../soap/header/TestGetHeaderBlocksWithNSURIWithParser.java |  5 ++---
 .../axiom/ts/soap/header/TestGetHeaderBlocksWithName.java   |  5 ++---
 .../soap/header/TestGetHeadersToProcessWithNamespace.java   |  5 ++---
 .../ts/soap/header/TestGetHeadersToProcessWithParser.java   |  5 ++---
 .../axiom/ts/soap/headerblock/BooleanAttributeTestCase.java |  6 ++----
 .../axiom/ts/soap/headerblock/TestBlobOMDataSource.java     |  5 ++---
 .../org/apache/axiom/ts/soap/headerblock/TestClone.java     |  8 ++------
 .../TestCloneProcessedWithoutPreservingModel.java           |  5 ++---
 .../axiom/ts/soap/headerblock/TestGetBooleanAttribute.java  |  8 ++------
 .../ts/soap/headerblock/TestGetBooleanAttributeDefault.java |  6 ++----
 .../ts/soap/headerblock/TestGetBooleanAttributeInvalid.java |  8 ++------
 .../soap/headerblock/TestGetBooleanAttributeUnspported.java |  6 ++----
 .../soap/headerblock/TestGetMustUnderstandWithParser.java   |  5 ++---
 .../org/apache/axiom/ts/soap/headerblock/TestGetRole.java   |  5 ++---
 .../axiom/ts/soap/headerblock/TestGetRoleWithParser.java    |  5 ++---
 .../apache/axiom/ts/soap/headerblock/TestGetVersion.java    |  5 ++---
 .../soap/headerblock/TestSetAttributeNamespacePrefix.java   |  6 ++----
 .../axiom/ts/soap/headerblock/TestSetBooleanAttribute.java  |  8 ++------
 .../headerblock/TestSetBooleanAttributeUnsupported.java     |  6 ++----
 .../org/apache/axiom/ts/soap/headerblock/TestSetRole.java   |  5 ++---
 .../TestSetRoleWithoutExistingNamespaceDecl.java            |  5 ++---
 .../apache/axiom/ts/soap/headerblock/TestWrongParent1.java  |  5 ++---
 .../apache/axiom/ts/soap/headerblock/TestWrongParent2.java  |  5 ++---
 .../apache/axiom/ts/soap/headerblock/TestWrongParent3.java  |  5 ++---
 .../java/org/apache/axiom/ts/soap/message/TestClone.java    |  8 ++------
 .../apache/axiom/ts/soap/message/TestCloneIncomplete.java   |  8 +++-----
 .../ts/soap/message/TestGetCharsetEncodingWithParser.java   |  5 +++--
 .../axiom/ts/soap/message/TestGetOMFactoryWithParser.java   |  5 +++--
 .../axiom/ts/soap/message/TestSetOMDocumentElement.java     |  5 ++---
 .../message/TestSetOMDocumentElementNonSOAPEnvelope.java    |  5 ++---
 .../org/apache/axiom/ts/soap/misc/GetSetChildTestCase.java  |  9 ++-------
 .../java/org/apache/axiom/ts/soap/misc/TestGetChild.java    |  4 +---
 .../java/org/apache/axiom/ts/soap/misc/TestSetChild.java    |  4 +---
 .../axiom/ts/soap/misc/TestSetChildVersionMismatch.java     |  4 +---
 .../axiom/ts/soap/xpath/TestXPathAppliedToSOAPEnvelope.java |  7 ++-----
 .../java/org/apache/axiom/ts/soap11/fault/TestGetNode.java  |  5 ++---
 .../java/org/apache/axiom/ts/soap11/fault/TestSetNode.java  |  5 ++---
 .../org/apache/axiom/ts/soap11/faultcode/TestGetValue.java  |  5 ++---
 .../axiom/ts/soap11/faultcode/TestGetValueWithParser.java   |  5 ++---
 .../axiom/ts/soap11/faultcode/TestSetValueFromQName.java    |  5 ++---
 .../apache/axiom/ts/soap11/faultreason/TestAddSOAPText.java |  5 ++---
 .../axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java   |  5 ++---
 .../axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java   |  6 ++++--
 .../axiom/ts/soap12/factory/TestCreateSOAPFaultSubCode.java |  5 ++---
 .../java/org/apache/axiom/ts/soap12/fault/TestGetNode.java  |  5 ++---
 .../apache/axiom/ts/soap12/fault/TestGetNodeWithParser.java |  8 ++++----
 .../axiom/ts/soap12/fault/TestMoreChildrenAddition.java     |  5 ++---
 .../java/org/apache/axiom/ts/soap12/fault/TestSetNode.java  |  5 ++---
 .../axiom/ts/soap12/faultcode/TestGetSubCodeWithParser.java |  8 ++++----
 .../axiom/ts/soap12/faultcode/TestGetValueWithParser.java   |  8 ++++----
 .../axiom/ts/soap12/faultcode/TestSetValueFromQName.java    |  5 ++---
 .../faultcode/TestSetValueFromQNameWithExistingValue.java   |  5 ++---
 .../apache/axiom/ts/soap12/faultreason/TestAddSOAPText.java |  5 ++---
 .../ts/soap12/faultreason/TestAddSOAPTextMultiple.java      |  5 ++---
 .../faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java |  5 ++---
 .../soap12/faultreason/TestGetAllSoapTextsWithParser.java   |  5 ++---
 .../axiom/ts/soap12/faultreason/TestGetFaultReasonText.java |  5 ++---
 .../faultreason/TestGetFaultReasonTextCaseSensitivity.java  |  5 ++---
 .../TestGetFaultReasonTextWithoutLangAttribute.java         |  5 ++---
 .../axiom/ts/soap12/faultreason/TestGetFirstSOAPText.java   |  5 ++---
 .../soap12/faultreason/TestGetFirstSOAPTextWithParser.java  |  8 ++++----
 .../soap12/faultsubcode/TestGetSubCodeNestedWithParser.java |  8 ++++----
 .../ts/soap12/faultsubcode/TestGetSubCodeWithParser.java    |  8 ++++----
 .../soap12/faultsubcode/TestGetValueAsQNameWithParser.java  |  5 ++---
 .../soap12/faultsubcode/TestGetValueNestedWithParser.java   |  8 ++++----
 .../ts/soap12/faultsubcode/TestGetValueWithParser.java      |  8 ++++----
 .../axiom/ts/soap12/faulttext/TestGetLangWithParser.java    |  8 ++++----
 .../header/TestExamineMustUnderstandHeaderBlocks.java       |  5 ++---
 .../axiom/ts/soap12/headerblock/TestGetRelayWithParser.java |  5 ++---
 .../axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java |  5 ++---
 .../header/TestExamineMustUnderstandHeaderBlocks.java       |  5 ++---
 .../ts/soapdom/message/TestLazySOAPFactorySelection.java    |  6 ++++--
 185 files changed, 421 insertions(+), 591 deletions(-)

diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
index a2d7ecd68..6df39a280 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
@@ -18,16 +18,12 @@
  */
 package org.apache.axiom.ts.soap;
 
-import org.apache.axiom.om.OMMetaFactory;
-
 import junit.framework.TestCase;
 
 public abstract class SOAPTestCase extends TestCase {
-    protected final OMMetaFactory metaFactory;
     protected final SOAPSpec spec;
 
-    public SOAPTestCase(OMMetaFactory metaFactory, SOAPSpec spec) {
-        this.metaFactory = metaFactory;
+    public SOAPTestCase(SOAPSpec spec) {
         this.spec = spec;
     }
 }
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SampleBasedSOAPTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SampleBasedSOAPTestCase.java
index 72c8d407f..497d2fa40 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SampleBasedSOAPTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SampleBasedSOAPTestCase.java
@@ -18,20 +18,23 @@
  */
 package org.apache.axiom.ts.soap;
 
+import com.google.inject.Inject;
+
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 
 public abstract class SampleBasedSOAPTestCase extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     private final SOAPSample sample;
 
-    public SampleBasedSOAPTestCase(
-            OMMetaFactory metaFactory, SOAPSpec spec, SOAPSampleSet sampleSet) {
-        super(metaFactory, spec);
+    public SampleBasedSOAPTestCase(SOAPSpec spec, SOAPSampleSet sampleSet) {
+        super(spec);
         sample = sampleSet.getMessage(spec);
     }
 
-    public SampleBasedSOAPTestCase(OMMetaFactory metaFactory, SOAPSample sample) {
-        super(metaFactory, sample.getSOAPSpec());
+    public SampleBasedSOAPTestCase(SOAPSample sample) {
+        super(sample.getSOAPSpec());
         this.sample = sample;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
index dd7d8b8ca..8a7e36776 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
@@ -45,14 +45,15 @@ import org.apache.axiom.ts.soap.SOAPTestCase;
 import com.google.inject.Inject;
 
 public abstract class FirstElementNameWithParserTestCase extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
     @Inject private SOAPFactory soapFactory;
 
     protected final QName qname;
     private final boolean supportsOptimization;
 
     public FirstElementNameWithParserTestCase(
-            OMMetaFactory metaFactory, SOAPSpec spec, QName qname, boolean supportsOptimization) {
-        super(metaFactory, spec);
+            SOAPSpec spec, QName qname, boolean supportsOptimization) {
+        super(spec);
         this.qname = qname;
         this.supportsOptimization = supportsOptimization;
     }
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java
index 1884415d2..6322347a3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault1.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.body;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -31,8 +30,8 @@ public class TestAddFault1 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddFault1(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestAddFault1(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java
index 865a7f0d2..1aa07e377 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.body;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -31,8 +30,8 @@ public class TestAddFault2 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddFault2(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestAddFault2(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
index b03ffb3d2..4a64e9fb4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
@@ -23,7 +23,6 @@ import static com.google.common.truth.Truth.assertAbout;
 import static org.apache.axiom.truth.xml.XMLTruth.xml;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -32,8 +31,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestCloneOMElement extends SampleBasedSOAPTestCase {
     @Inject
-    public TestCloneOMElement(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.WSA);
+    public TestCloneOMElement(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.WSA);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
index 9464dd898..6b1f94ffc 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFault.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.body;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -31,8 +30,8 @@ public class TestGetFault extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetFault(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetFault(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
index e79177652..739dd15b1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultFakeFault.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.body;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -36,8 +35,8 @@ public class TestGetFaultFakeFault extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetFaultFakeFault(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetFaultFakeFault(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
index 451198720..8ba28dbf5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.body;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -34,8 +33,8 @@ public class TestGetFaultNoFault extends SOAPTestCase {
     private final QName qname;
 
     @Inject
-    public TestGetFaultNoFault(OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
-        super(metaFactory, spec);
+    public TestGetFaultNoFault(SOAPSpec spec, QName qname) {
+        super(spec);
         this.qname = qname;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
index a4f4b8212..e366a0a8f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.body;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -29,8 +28,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestGetFaultWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetFaultWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetFaultWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParserNoFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParserNoFault.java
index f332c3867..984f1b1cc 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParserNoFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultWithParserNoFault.java
@@ -21,15 +21,14 @@ package org.apache.axiom.ts.soap.body;
 import com.google.inject.Inject;
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.ts.soap.SOAPSpec;
 
 /** Tests {@link SOAPBody#getFault()} in the case where the body doesn't contain a SOAP fault. */
 public class TestGetFaultWithParserNoFault extends FirstElementNameWithParserTestCase {
     @Inject
-    public TestGetFaultWithParserNoFault(OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
-        super(metaFactory, spec, qname, false);
+    public TestGetFaultWithParserNoFault(SOAPSpec spec, QName qname) {
+        super(spec, qname, false);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java
index 2415e9d01..6406f903e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameEmptyBody.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.body;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -35,8 +34,8 @@ public class TestGetFirstElementLocalNameEmptyBody extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetFirstElementLocalNameEmptyBody(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetFirstElementLocalNameEmptyBody(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser.java
index bcfe92cbd..6ee5066ec 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.body;
 import com.google.inject.Inject;
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.ts.soap.SOAPSpec;
 
@@ -31,9 +30,8 @@ import org.apache.axiom.ts.soap.SOAPSpec;
  */
 public class TestGetFirstElementLocalNameWithParser extends FirstElementNameWithParserTestCase {
     @Inject
-    public TestGetFirstElementLocalNameWithParser(
-            OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
-        super(metaFactory, spec, qname, true);
+    public TestGetFirstElementLocalNameWithParser(SOAPSpec spec, QName qname) {
+        super(spec, qname, true);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java
index 243b8a912..9a1dcfbba 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java
@@ -22,7 +22,6 @@ import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -34,8 +33,8 @@ public class TestGetFirstElementLocalNameWithParser2 extends SampleBasedSOAPTest
 
     @Inject
     public TestGetFirstElementLocalNameWithParser2(
-            OMMetaFactory metaFactory, SOAPSpec spec, @Named("buildPayload") boolean buildPayload) {
-        super(metaFactory, spec, SOAPSampleSet.NO_HEADER);
+            SOAPSpec spec, @Named("buildPayload") boolean buildPayload) {
+        super(spec, SOAPSampleSet.NO_HEADER);
         this.buildPayload = buildPayload;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java
index be642251c..6f6d0d649 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java
@@ -40,12 +40,12 @@ import com.google.inject.Inject;
  * href="https://issues.apache.org/jira/browse/AXIOM-282">AXIOM-282</a> is no longer applicable.
  */
 public class TestGetFirstElementLocalNameWithParserNoLookahead extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetFirstElementLocalNameWithParserNoLookahead(
-            OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetFirstElementLocalNameWithParserNoLookahead(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java
index be069af1c..76a07e2b1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSEmptyBody.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.body;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -34,8 +33,8 @@ public class TestGetFirstElementNSEmptyBody extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetFirstElementNSEmptyBody(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetFirstElementNSEmptyBody(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSWithParser.java
index 2dff6e125..5e736fb90 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementNSWithParser.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.body;
 import com.google.inject.Inject;
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -32,8 +31,8 @@ import org.apache.axiom.ts.soap.SOAPSpec;
  */
 public class TestGetFirstElementNSWithParser extends FirstElementNameWithParserTestCase {
     @Inject
-    public TestGetFirstElementNSWithParser(OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
-        super(metaFactory, spec, qname, true);
+    public TestGetFirstElementNSWithParser(SOAPSpec spec, QName qname) {
+        super(spec, qname, true);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java
index 00a5ae142..77721089f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFault.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.body;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -31,8 +30,8 @@ public class TestHasFault extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestHasFault(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestHasFault(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java
index 37daca8b4..6fca2799f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultAfterReplace.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.body;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
@@ -38,8 +37,8 @@ public class TestHasFaultAfterReplace extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestHasFaultAfterReplace(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestHasFaultAfterReplace(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
index bfb3f34fc..0eb9afd8b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultFakeFault.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.body;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -36,8 +35,8 @@ public class TestHasFaultFakeFault extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestHasFaultFakeFault(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestHasFaultFakeFault(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
index 6fdd517fc..a8a2027da 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.body;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -34,8 +33,8 @@ public class TestHasFaultNoFault extends SOAPTestCase {
     private final QName qname;
 
     @Inject
-    public TestHasFaultNoFault(OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
-        super(metaFactory, spec);
+    public TestHasFaultNoFault(SOAPSpec spec, QName qname) {
+        super(spec);
         this.qname = qname;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java
index b392ea6ce..ed53790a6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithOMSEUnknownName.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.body;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.ds.StringOMDataSource;
 import org.apache.axiom.soap.SOAPBody;
@@ -37,8 +36,8 @@ public class TestHasFaultWithOMSEUnknownName extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestHasFaultWithOMSEUnknownName(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestHasFaultWithOMSEUnknownName(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
index 80d2d985b..2d065297c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.body;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -28,8 +27,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestHasFaultWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestHasFaultWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.SIMPLE_FAULT);
+    public TestHasFaultWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParserNoFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParserNoFault.java
index 3771013d3..535b20bb8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParserNoFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultWithParserNoFault.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.body;
 import com.google.inject.Inject;
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.ts.soap.SOAPSpec;
 
@@ -32,8 +31,8 @@ import org.apache.axiom.ts.soap.SOAPSpec;
  */
 public class TestHasFaultWithParserNoFault extends FirstElementNameWithParserTestCase {
     @Inject
-    public TestHasFaultWithParserNoFault(OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
-        super(metaFactory, spec, qname, true);
+    public TestHasFaultWithParserNoFault(SOAPSpec spec, QName qname) {
+        super(spec, qname, true);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestSerializeWithXSITypeAttribute.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestSerializeWithXSITypeAttribute.java
index 1918780b3..d8b2b8611 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestSerializeWithXSITypeAttribute.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestSerializeWithXSITypeAttribute.java
@@ -37,12 +37,14 @@ import com.google.inject.Inject;
 
 /** Regression test for <a href="https://issues.apache.org/jira/browse/AXIOM-107">AXIOM-107</a>. */
 public class TestSerializeWithXSITypeAttribute extends SampleBasedSOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     private final SerializationStrategy serializationStrategy;
 
     @Inject
     public TestSerializeWithXSITypeAttribute(
-            OMMetaFactory metaFactory, SOAPSpec spec, SerializationStrategy serializationStrategy) {
-        super(metaFactory, spec, SOAPSampleSet.XSI_TYPE);
+            SOAPSpec spec, SerializationStrategy serializationStrategy) {
+        super(spec, SOAPSampleSet.XSI_TYPE);
         this.serializationStrategy = serializationStrategy;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java
index 29395ce34..2f552b3e9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInEpilog.java
@@ -36,11 +36,12 @@ import com.google.inject.Inject;
  * document element.
  */
 public class TestCommentInEpilog extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestCommentInEpilog(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCommentInEpilog(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
index 4925d8d6f..f15f83c2e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
@@ -30,9 +30,11 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 /** Tests that the SOAP builder creates {@link OMComment} nodes for comments in the XML prolog. */
 public class TestCommentInProlog extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     @Inject
-    public TestCommentInProlog(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCommentInProlog(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromDOMSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromDOMSource.java
index 58c2f2c38..8bb5068d9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromDOMSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromDOMSource.java
@@ -38,9 +38,11 @@ import org.xml.sax.InputSource;
 import com.google.inject.Inject;
 
 public class TestCreateSOAPModelBuilderFromDOMSource extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     @Inject
-    public TestCreateSOAPModelBuilderFromDOMSource(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCreateSOAPModelBuilderFromDOMSource(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromSAXSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromSAXSource.java
index 82b5c8387..a453e9c39 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromSAXSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderFromSAXSource.java
@@ -42,9 +42,11 @@ import org.xml.sax.XMLReader;
 import com.google.inject.Inject;
 
 public class TestCreateSOAPModelBuilderFromSAXSource extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     @Inject
-    public TestCreateSOAPModelBuilderFromSAXSource(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCreateSOAPModelBuilderFromSAXSource(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java
index 7c0c8ad6a..94eb2ad70 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCreateSOAPModelBuilderMTOMContentTypeMismatch.java
@@ -52,10 +52,11 @@ import jakarta.mail.internet.MimeMultipart;
  * message.
  */
 public class TestCreateSOAPModelBuilderMTOMContentTypeMismatch extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     @Inject
-    public TestCreateSOAPModelBuilderMTOMContentTypeMismatch(
-            OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCreateSOAPModelBuilderMTOMContentTypeMismatch(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java
index 8cbc57d92..f260f391a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestDTD.java
@@ -41,11 +41,12 @@ import com.google.inject.Inject;
  * the methods taking a stream as input will generally reject DTDs at a much lower level.
  */
 public class TestDTD extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestDTD(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestDTD(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
index abdcb0440..6eed7f821 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilder.java
@@ -36,9 +36,11 @@ import org.apache.axiom.ts.soap.SOAPSampleAdapter;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
 
 public class TestRegisterCustomBuilder extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     @Inject
-    public TestRegisterCustomBuilder(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestRegisterCustomBuilder(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
index fa484e9a9..485bddee2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.builder;
 import com.google.inject.Inject;
 import org.apache.axiom.blob.MemoryBlob;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.ds.custombuilder.BlobOMDataSourceCustomBuilder;
 import org.apache.axiom.om.ds.custombuilder.CustomBuilder;
@@ -43,9 +42,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 public class TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck
         extends SampleBasedSOAPTestCase {
     @Inject
-    public TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck(
-            OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.WSA);
+    public TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.WSA);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
index 1f8652f3e..a33cfe852 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/CloneTestCase.java
@@ -22,7 +22,6 @@ import static com.google.common.truth.Truth.assertAbout;
 import static org.apache.axiom.truth.xml.XMLTruth.xml;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.soap.SOAPCloneOptions;
@@ -33,8 +32,8 @@ import org.apache.axiom.ts.soap.SOAPTestCase;
 import java.util.Iterator;
 
 public abstract class CloneTestCase extends SOAPTestCase {
-    public CloneTestCase(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public CloneTestCase(SOAPSpec spec) {
+        super(spec);
     }
 
     /**
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java
index d9e50da5a..c69aa6319 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddElementAfterBody.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPProcessingException;
@@ -43,9 +42,8 @@ public class TestAddElementAfterBody extends SOAPTestCase {
     private final boolean header;
 
     @Inject
-    public TestAddElementAfterBody(
-            OMMetaFactory metaFactory, SOAPSpec spec, @Named("header") boolean header) {
-        super(metaFactory, spec);
+    public TestAddElementAfterBody(SOAPSpec spec, @Named("header") boolean header) {
+        super(spec);
         this.header = header;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java
index 0e247e071..3e166f457 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestAddHeaderToIncompleteEnvelope.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.envelope;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
@@ -36,8 +35,8 @@ public class TestAddHeaderToIncompleteEnvelope extends SampleBasedSOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddHeaderToIncompleteEnvelope(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.NO_HEADER);
+    public TestAddHeaderToIncompleteEnvelope(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.NO_HEADER);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java
index 1ac0f714f..bff1120a1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestBodyHeaderOrder.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.envelope;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
@@ -32,8 +31,8 @@ public class TestBodyHeaderOrder extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestBodyHeaderOrder(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestBodyHeaderOrder(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
index 86f3295b3..67032b2ba 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
@@ -24,11 +24,13 @@ import org.apache.axiom.ts.soap.SOAPSample;
 import org.apache.axiom.ts.soap.SOAPSampleAdapter;
 
 public class TestClone extends CloneTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     private final SOAPSample message;
 
     @Inject
-    public TestClone(OMMetaFactory metaFactory, SOAPSample message) {
-        super(metaFactory, message.getSOAPSpec());
+    public TestClone(SOAPSample message) {
+        super(message.getSOAPSpec());
         this.message = message;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement1.java
index dad3b2c8e..b513f384c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement1.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.envelope;
 
 import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.ds.StringOMDataSource;
@@ -34,8 +33,8 @@ public class TestCloneWithSourcedElement1 extends CloneTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestCloneWithSourcedElement1(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCloneWithSourcedElement1(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement2.java
index 98b759491..c4505e0cb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestCloneWithSourcedElement2.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.envelope;
 
 import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.ds.StringOMDataSource;
@@ -36,8 +35,8 @@ public class TestCloneWithSourcedElement2 extends CloneTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestCloneWithSourcedElement2(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCloneWithSourcedElement2(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
index e92487bfd..1d906643d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestDetach.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.envelope;
 
 import com.google.inject.Inject;
 import org.apache.axiom.om.OMDocument;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -34,8 +33,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
  */
 public class TestDetach extends SampleBasedSOAPTestCase {
     @Inject
-    public TestDetach(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.NO_HEADER);
+    public TestDetach(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.NO_HEADER);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
index 6414cb67b..cf8911e25 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBody.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.envelope;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -32,8 +31,8 @@ public class TestGetBody extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetBody(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetBody(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java
index 6aa3defa6..919c83bc7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEmptyEnvelope.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.envelope;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPSpec;
 import org.apache.axiom.ts.soap.SOAPTestCase;
@@ -29,8 +28,8 @@ public class TestGetBodyOnEmptyEnvelope extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetBodyOnEmptyEnvelope(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetBodyOnEmptyEnvelope(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java
index 4793d9d0c..9339b696d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyOnEnvelopeWithHeaderOnly.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.envelope;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -31,8 +30,8 @@ public class TestGetBodyOnEnvelopeWithHeaderOnly extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetBodyOnEnvelopeWithHeaderOnly(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetBodyOnEnvelopeWithHeaderOnly(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
index 215a48544..df54c5879 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetBodyWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.envelope;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -29,8 +28,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestGetBodyWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetBodyWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.NO_HEADER);
+    public TestGetBodyWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.NO_HEADER);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
index 07162e563..88eb8a3a6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeader.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.envelope;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -32,8 +31,8 @@ public class TestGetHeader extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetHeader(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetHeader(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
index efcbf4ea1..8859a685e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.envelope;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeader;
@@ -29,8 +28,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestGetHeaderWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetHeaderWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.WSA);
+    public TestGetHeaderWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.WSA);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
index a363573f4..26e92fc73 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParserNoHeader.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.envelope;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -32,8 +31,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
  */
 public class TestGetHeaderWithParserNoHeader extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetHeaderWithParserNoHeader(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.NO_HEADER);
+    public TestGetHeaderWithParserNoHeader(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.NO_HEADER);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java
index 1a4a340e4..ecc6a572a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeader.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.envelope;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
@@ -31,8 +30,8 @@ public class TestGetOrCreateHeader extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetOrCreateHeader(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetOrCreateHeader(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
index f973ce4fe..3d2f01208 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetOrCreateHeaderWithParserNoHeader.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.envelope;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeader;
@@ -34,8 +33,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
  */
 public class TestGetOrCreateHeaderWithParserNoHeader extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetOrCreateHeaderWithParserNoHeader(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.NO_HEADER);
+    public TestGetOrCreateHeaderWithParserNoHeader(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.NO_HEADER);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
index 3bb9f2ccf..8838ea935 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.envelope;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -36,9 +35,8 @@ public class TestGetSOAPBodyFirstElementLocalNameAndNS extends SOAPTestCase {
     private final QName qname;
 
     @Inject
-    public TestGetSOAPBodyFirstElementLocalNameAndNS(
-            OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
-        super(metaFactory, spec);
+    public TestGetSOAPBodyFirstElementLocalNameAndNS(SOAPSpec spec, QName qname) {
+        super(spec);
         this.qname = qname;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
index 8a1f410a7..875bff011 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
@@ -41,14 +41,14 @@ import com.google.inject.Inject;
  * of the element without actually instantiating the corresponding {@link OMElement}.
  */
 public class TestGetSOAPBodyFirstElementLocalNameAndNSWithParser extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
     @Inject private SOAPFactory soapFactory;
 
     private final QName qname;
 
     @Inject
-    public TestGetSOAPBodyFirstElementLocalNameAndNSWithParser(
-            OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
-        super(metaFactory, spec);
+    public TestGetSOAPBodyFirstElementLocalNameAndNSWithParser(SOAPSpec spec, QName qname) {
+        super(spec);
         this.qname = qname;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
index ced9c91a5..2ea250514 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
@@ -25,7 +25,6 @@ import javax.xml.stream.XMLStreamReader;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -43,9 +42,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 public class TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock
         extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock(
-            OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.WSA);
+    public TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.WSA);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java
index 43cc5b1fa..979d1dee1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFault.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.envelope;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -31,8 +30,8 @@ public class TestHasFault extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestHasFault(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestHasFault(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
index 2efb3c968..5360ba2f0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestHasFaultWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.envelope;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -27,8 +26,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestHasFaultWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestHasFaultWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.SIMPLE_FAULT);
+    public TestHasFaultWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAndConsumeWithOMSEInBody.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAndConsumeWithOMSEInBody.java
index 5d13c249b..2e74972a0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAndConsumeWithOMSEInBody.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAndConsumeWithOMSEInBody.java
@@ -30,7 +30,6 @@ import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.util.StAXUtils;
@@ -47,8 +46,8 @@ public class TestSerializeAndConsumeWithOMSEInBody extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSerializeAndConsumeWithOMSEInBody(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSerializeAndConsumeWithOMSEInBody(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAsChild.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAsChild.java
index 167732f3e..660000059 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAsChild.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerializeAsChild.java
@@ -26,7 +26,6 @@ import java.io.OutputStream;
 import org.apache.axiom.blob.Blobs;
 import org.apache.axiom.blob.MemoryBlob;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -39,8 +38,8 @@ public class TestSerializeAsChild extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSerializeAsChild(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSerializeAsChild(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
index dae1abd23..c07807954 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/CreateSOAPElementWithoutParentTestCase.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.ts.soap.SOAPElementType;
@@ -35,9 +34,8 @@ import org.apache.axiom.ts.soap.SOAPTestCase;
 public abstract class CreateSOAPElementWithoutParentTestCase extends SOAPTestCase {
     protected final SOAPElementType type;
 
-    public CreateSOAPElementWithoutParentTestCase(
-            OMMetaFactory metaFactory, SOAPSpec spec, SOAPElementType type) {
-        super(metaFactory, spec);
+    public CreateSOAPElementWithoutParentTestCase(SOAPSpec spec, SOAPElementType type) {
+        super(spec);
         this.type = type;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java
index 7a1ee8343..bc6a24fe6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateDefaultSOAPMessage.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.factory;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -39,8 +38,8 @@ public class TestCreateDefaultSOAPMessage extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestCreateDefaultSOAPMessage(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCreateDefaultSOAPMessage(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElement.java
index f5d6eeb8a..c39cdb31d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElement.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.factory;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPElementType;
 import org.apache.axiom.ts.soap.SOAPElementTypeAdapter;
@@ -40,9 +39,8 @@ public class TestCreateSOAPElement extends CreateSOAPElementWithoutParentTestCas
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestCreateSOAPElement(
-            OMMetaFactory metaFactory, SOAPSpec spec, @Named("type") SOAPElementType type) {
-        super(metaFactory, spec, type);
+    public TestCreateSOAPElement(SOAPSpec spec, @Named("type") SOAPElementType type) {
+        super(spec, type);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithNullParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithNullParent.java
index 132a06468..e463956d8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithNullParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithNullParent.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.factory;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -54,11 +53,10 @@ public class TestCreateSOAPElementWithNullParent extends CreateSOAPElementWithou
 
     @Inject
     public TestCreateSOAPElementWithNullParent(
-            OMMetaFactory metaFactory,
             SOAPSpec spec,
             @Named("childType") SOAPElementType type,
             @Named("type") SOAPElementType parentType) {
-        super(metaFactory, spec, type);
+        super(spec, type);
         this.parentType = parentType;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
index 33fa08817..f4506e177 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPElementWithParent.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -61,11 +60,10 @@ public class TestCreateSOAPElementWithParent extends SOAPTestCase {
 
     @Inject
     public TestCreateSOAPElementWithParent(
-            OMMetaFactory metaFactory,
             SOAPSpec spec,
             @Named("childType") SOAPElementType type,
             @Named("type") SOAPElementType parentType) {
-        super(metaFactory, spec);
+        super(spec);
         this.type = type;
         this.parentType = parentType;
     }
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java
index c7dd34db3..460f5137d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPEnvelopeWithCustomPrefix.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.factory;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -35,8 +34,8 @@ public class TestCreateSOAPEnvelopeWithCustomPrefix extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestCreateSOAPEnvelopeWithCustomPrefix(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCreateSOAPEnvelopeWithCustomPrefix(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
index d25222bc9..b192baa98 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPFactory;
@@ -44,8 +43,8 @@ public class TestCreateSOAPFaultWithException extends SOAPTestCase {
 
     @Inject
     public TestCreateSOAPFaultWithException(
-            OMMetaFactory metaFactory, SOAPSpec spec, @Named("withParent") boolean withParent) {
-        super(metaFactory, spec);
+            SOAPSpec spec, @Named("withParent") boolean withParent) {
+        super(spec);
         this.withParent = withParent;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPHeaderBlockFromOMElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPHeaderBlockFromOMElement.java
index efde7d893..934f27352 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPHeaderBlockFromOMElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPHeaderBlockFromOMElement.java
@@ -34,11 +34,12 @@ import org.apache.axiom.ts.soap.SOAPTestCase;
 import com.google.inject.Inject;
 
 public class TestCreateSOAPHeaderBlockFromOMElement extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestCreateSOAPHeaderBlockFromOMElement(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCreateSOAPHeaderBlockFromOMElement(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java
index dc50eda56..abf91af62 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestFactoryIsSingleton.java
@@ -30,9 +30,11 @@ import org.apache.axiom.ts.soap.SOAPTestCase;
  * {@link OMMetaFactory#getSOAP12Factory()} return the same instances.
  */
 public class TestFactoryIsSingleton extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     @Inject
-    public TestFactoryIsSingleton(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestFactoryIsSingleton(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java
index 13bf3d81a..c09e15b69 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultEnvelope.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.factory;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -36,8 +35,8 @@ public class TestGetDefaultEnvelope extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetDefaultEnvelope(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetDefaultEnvelope(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultFaultEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultFaultEnvelope.java
index 7d86e2d6e..9f4ed9d58 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultFaultEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetDefaultFaultEnvelope.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.factory;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -31,8 +30,8 @@ public class TestGetDefaultFaultEnvelope extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetDefaultFaultEnvelope(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetDefaultFaultEnvelope(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetMetaFactory.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetMetaFactory.java
index fa8c75383..ff3ccbcf3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetMetaFactory.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetMetaFactory.java
@@ -31,11 +31,12 @@ import com.google.inject.Inject;
  * from which the reference to the {@link OMFactory} was obtained.
  */
 public class TestGetMetaFactory extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetMetaFactory(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetMetaFactory(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetNamespace.java
index 5b1e14f91..1d1f35db8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestGetNamespace.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.factory;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPFactory;
@@ -31,8 +30,8 @@ public class TestGetNamespace extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetNamespace(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetNamespace(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java
index c50f28edd..26aeea0bf 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java
@@ -23,7 +23,6 @@ import java.util.Comparator;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.soap.SOAPFaultCode;
@@ -56,11 +55,10 @@ public class TestChildOrder extends SOAPTestCase {
 
     @Inject
     public TestChildOrder(
-            OMMetaFactory metaFactory,
             SOAPSpec spec,
             @Named("inputOrder") SOAPFaultChild[] inputOrder,
             SerializationStrategy serializationStrategy) {
-        super(metaFactory, spec);
+        super(spec);
         this.inputOrder = inputOrder;
         this.serializationStrategy = serializationStrategy;
     }
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
index b2fc1f716..8e3c199ff 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetCodeWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.fault;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -28,8 +27,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestGetCodeWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetCodeWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetCodeWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
index a1f40ee82..4630b3f52 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetDetailWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.fault;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -28,8 +27,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestGetDetailWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetDetailWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetDetailWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetException.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetException.java
index 056f3a41a..ee30d6557 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetException.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetException.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.fault;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
@@ -35,8 +34,8 @@ public class TestGetException extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetException(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetException(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
index 51505fe0a..9a32cbd68 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetReasonWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.fault;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -28,8 +27,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestGetReasonWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetReasonWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetReasonWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
index 717fc3d9e..a94d313f1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestGetRoleWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.fault;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -28,8 +27,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestGetRoleWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetRoleWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.CUSTOM_ROLE_FAULT);
+    public TestGetRoleWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.CUSTOM_ROLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java
index 3fa90093b..b6c7022de 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.fault;
 import java.util.Iterator;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPConstants;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
@@ -35,8 +34,8 @@ public class TestSetException extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetException(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSetException(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
index dfd54ba3d..094c50b18 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent1.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.fault;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.apache.axiom.om.OMContainer;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
@@ -41,8 +40,8 @@ public class TestWrongParent1 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestWrongParent1(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestWrongParent1(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
index 602b424e0..0c5b2b728 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent2.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.fault;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -41,8 +40,8 @@ public class TestWrongParent2 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestWrongParent2(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestWrongParent2(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
index 4f04a11dd..46a9e7991 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestWrongParent3.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.fault;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
@@ -41,8 +40,8 @@ public class TestWrongParent3 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestWrongParent3(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestWrongParent3(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQName.java
index 98a3f4262..4e5782e28 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQName.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.faultcode;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
@@ -34,8 +33,8 @@ public class TestGetValueAsQName extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetValueAsQName(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetValueAsQName(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java
index 7a4446c66..04ee7a653 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultcode/TestGetValueAsQNameWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.faultcode;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultClassifier;
 import org.apache.axiom.soap.SOAPFaultCode;
@@ -32,8 +31,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
  */
 public class TestGetValueAsQNameWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetValueAsQNameWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetValueAsQNameWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
index 6b317fba8..97597f002 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.faultdetail;
 import java.util.Iterator;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -38,8 +37,8 @@ public class TestAddDetailEntry extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddDetailEntry(OMMetaFactory omMetaFactory, SOAPSpec spec) {
-        super(omMetaFactory, spec);
+    public TestAddDetailEntry(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestDetailEntriesUsingDefaultNamespaceWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestDetailEntriesUsingDefaultNamespaceWithParser.java
index 99509bd0c..7d2cdf330 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestDetailEntriesUsingDefaultNamespaceWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestDetailEntriesUsingDefaultNamespaceWithParser.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.faultdetail;
 
 import com.google.inject.Inject;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultDetail;
@@ -31,9 +30,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 /** Tests parsing of a SOAP fault that has detail entries that use a default namespace. */
 public class TestDetailEntriesUsingDefaultNamespaceWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestDetailEntriesUsingDefaultNamespaceWithParser(
-            OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.FAULT_DETAIL_DEFAULT_NAMESPACE);
+    public TestDetailEntriesUsingDefaultNamespaceWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.FAULT_DETAIL_DEFAULT_NAMESPACE);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
index cf6500b59..6935748dd 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.faultdetail;
 import java.util.Iterator;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -37,8 +36,8 @@ public class TestGetAllDetailEntries extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetAllDetailEntries(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetAllDetailEntries(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
index c07d2ca8d..3f8df46b3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
@@ -22,7 +22,6 @@ import com.google.inject.Inject;
 import java.util.Iterator;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultDetail;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -32,8 +31,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 // SOAP Fault Detail Test (With Parser)
 public class TestGetAllDetailEntriesWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetAllDetailEntriesWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetAllDetailEntriesWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestSerialization.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestSerialization.java
index 7a5ed50b8..fb8662372 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestSerialization.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestSerialization.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.faultdetail;
 
 import java.io.StringWriter;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -37,8 +36,8 @@ public class TestSerialization extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSerialization(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSerialization(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestWSCommons202.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestWSCommons202.java
index f0f1528e4..8db4e5767 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestWSCommons202.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestWSCommons202.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.faultdetail;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultDetail;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -31,8 +30,8 @@ public class TestWSCommons202 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestWSCommons202(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestWSCommons202(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValue.java
index 724bfd433..80e8b1d43 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValue.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.faultnode;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultNode;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -30,8 +29,8 @@ public class TestGetFaultNodeValue extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetFaultNodeValue(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetFaultNodeValue(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java
index 04b680019..59ba44fba 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestGetFaultNodeValueWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.faultnode;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -27,8 +26,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestGetFaultNodeValueWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetFaultNodeValueWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.CUSTOM_ROLE_FAULT);
+    public TestGetFaultNodeValueWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.CUSTOM_ROLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestSetFaultNodeValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestSetFaultNodeValue.java
index fa794b990..81ddbab5c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestSetFaultNodeValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultnode/TestSetFaultNodeValue.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.faultnode;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultNode;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -30,8 +29,8 @@ public class TestSetFaultNodeValue extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetFaultNodeValue(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSetFaultNodeValue(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultreason/TestGetFaultReasonText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultreason/TestGetFaultReasonText.java
index d391e3c0f..5e0cf546d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultreason/TestGetFaultReasonText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultreason/TestGetFaultReasonText.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Locale;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultReason;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -33,8 +32,8 @@ import com.google.inject.Inject;
 
 public class TestGetFaultReasonText extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetFaultReasonText(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetFaultReasonText(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValue.java
index 089c1b631..c3d8d60db 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValue.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.faultrole;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultRole;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -30,8 +29,8 @@ public class TestGetRoleValue extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetRoleValue(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetRoleValue(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValueWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValueWithParser.java
index 8b6b2b9eb..2bd9845ac 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValueWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestGetRoleValueWithParser.java
@@ -18,17 +18,17 @@
  */
 package org.apache.axiom.ts.soap.faultrole;
 
-import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
 import org.apache.axiom.ts.soap.SOAPSpec;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetRoleValueWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetRoleValueWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.CUSTOM_ROLE_FAULT);
+    public TestGetRoleValueWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.CUSTOM_ROLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestSetRoleValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestSetRoleValue.java
index 19fdaf7cd..a2d10a15d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestSetRoleValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultrole/TestSetRoleValue.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.faultrole;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultRole;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -30,8 +29,8 @@ public class TestSetRoleValue extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetRoleValue(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSetRoleValue(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLang.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLang.java
index 14f52cce6..1b7c7da79 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLang.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLang.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.faulttext;
 
 import javax.xml.XMLConstants;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultText;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -32,8 +31,8 @@ public class TestGetLang extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetLang(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetLang(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLangFromParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLangFromParser.java
index b07a6dfed..be7cc43aa 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLangFromParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestGetLangFromParser.java
@@ -18,17 +18,17 @@
  */
 package org.apache.axiom.ts.soap.faulttext;
 
-import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
 import org.apache.axiom.ts.soap.SOAPSpec;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetLangFromParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetLangFromParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetLangFromParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestSetLang.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestSetLang.java
index 0d4414c70..7a3eefd24 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestSetLang.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faulttext/TestSetLang.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.faulttext;
 
 import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultText;
@@ -32,8 +31,8 @@ public class TestSetLang extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetLang(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSetLang(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java
index c412aa903..a53f1fc19 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -36,8 +35,8 @@ public class TestAddChildWithPlainOMElement extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddChildWithPlainOMElement(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestAddChildWithPlainOMElement(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
index 4dabaf8d7..8693e61cc 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlock.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.header;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -36,8 +35,8 @@ public class TestAddHeaderBlock extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddHeaderBlock(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestAddHeaderBlock(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQName.java
index cafe367ab..b7e77a4e9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQName.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.header;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
@@ -35,8 +34,8 @@ public class TestAddHeaderBlockFromQName extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddHeaderBlockFromQName(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestAddHeaderBlockFromQName(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java
index 7adb67ac7..7f9837f37 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockFromQNameWithoutNamespace.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
@@ -40,8 +39,8 @@ public class TestAddHeaderBlockFromQNameWithoutNamespace extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddHeaderBlockFromQNameWithoutNamespace(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestAddHeaderBlockFromQNameWithoutNamespace(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java
index d49eb7278..09be03eed 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace1.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.header;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -39,8 +38,8 @@ public class TestAddHeaderBlockWithoutNamespace1 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddHeaderBlockWithoutNamespace1(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestAddHeaderBlockWithoutNamespace1(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java
index 2a20fa9dc..586b21b24 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddHeaderBlockWithoutNamespace2.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.header;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -39,8 +38,8 @@ public class TestAddHeaderBlockWithoutNamespace2 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddHeaderBlockWithoutNamespace2(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestAddHeaderBlockWithoutNamespace2(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java
index 2bdeac00e..45e253c9c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardIncomplete.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.header;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -28,8 +27,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 // Regression test for AXIOM-223 (see r567512)
 public class TestDiscardIncomplete extends SampleBasedSOAPTestCase {
     @Inject
-    public TestDiscardIncomplete(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.WSA);
+    public TestDiscardIncomplete(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.WSA);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
index f6b3988f1..34c7675e0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.header;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -39,8 +38,8 @@ import com.google.inject.Inject;
  */
 public class TestDiscardPartiallyBuilt extends SampleBasedSOAPTestCase {
     @Inject
-    public TestDiscardPartiallyBuilt(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.WSA);
+    public TestDiscardPartiallyBuilt(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.WSA);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java
index 30b18479b..e1d6f9456 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocks.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.header;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -35,8 +34,8 @@ public class TestExamineAllHeaderBlocks extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestExamineAllHeaderBlocks(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestExamineAllHeaderBlocks(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
index f8cbc26f6..81385d3c7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.header;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -31,8 +30,8 @@ import com.google.inject.Inject;
 
 public class TestExamineAllHeaderBlocksWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestExamineAllHeaderBlocksWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.WSA);
+    public TestExamineAllHeaderBlocksWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.WSA);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocks.java
index e31169d8c..1904a77d6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocks.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.header;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -35,8 +34,8 @@ public class TestExamineHeaderBlocks extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestExamineHeaderBlocks(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestExamineHeaderBlocks(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocksWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocksWithParser.java
index a143d6147..6aa679375 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocksWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocksWithParser.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -35,8 +34,8 @@ import com.google.inject.Inject;
 
 public class TestExamineHeaderBlocksWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestExamineHeaderBlocksWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.HEADERS);
+    public TestExamineHeaderBlocksWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.HEADERS);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java
index 9eb139e62..27e6ec846 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -35,9 +34,8 @@ import com.google.inject.Inject;
 
 public class TestExamineMustUnderstandHeaderBlocksWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestExamineMustUnderstandHeaderBlocksWithParser(
-            OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.HEADERS);
+    public TestExamineMustUnderstandHeaderBlocksWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.HEADERS);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExtractAllHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExtractAllHeaderBlocks.java
index dbab8775c..d8710e49b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExtractAllHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExtractAllHeaderBlocks.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.header;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -35,8 +34,8 @@ public class TestExtractAllHeaderBlocks extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestExtractAllHeaderBlocks(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestExtractAllHeaderBlocks(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java
index 28e612028..ab447e6c6 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURI.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.header;
 
 import java.util.ArrayList;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -35,8 +34,8 @@ public class TestGetHeaderBlocksWithNSURI extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetHeaderBlocksWithNSURI(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetHeaderBlocksWithNSURI(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURIWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURIWithParser.java
index 54aa286db..c5fd27fda 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURIWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURIWithParser.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -35,8 +34,8 @@ import com.google.inject.Inject;
 
 public class TestGetHeaderBlocksWithNSURIWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetHeaderBlocksWithNSURIWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.HEADERS);
+    public TestGetHeaderBlocksWithNSURIWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.HEADERS);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithName.java
index b3cafecb7..34dfaf309 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithName.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -35,8 +34,8 @@ import com.google.inject.Inject;
 
 public class TestGetHeaderBlocksWithName extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetHeaderBlocksWithName(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.HEADERS);
+    public TestGetHeaderBlocksWithName(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.HEADERS);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithNamespace.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithNamespace.java
index a1bb0db5c..6e509f1c8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithNamespace.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithNamespace.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.header;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.RolePlayer;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -37,8 +36,8 @@ public class TestGetHeadersToProcessWithNamespace extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetHeadersToProcessWithNamespace(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetHeadersToProcessWithNamespace(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithParser.java
index c88fb8981..86f8c8107 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeadersToProcessWithParser.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.header;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.RolePlayer;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeader;
@@ -34,8 +33,8 @@ import com.google.inject.Inject;
 
 public class TestGetHeadersToProcessWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetHeadersToProcessWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.HEADERS);
+    public TestGetHeadersToProcessWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.HEADERS);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/BooleanAttributeTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/BooleanAttributeTestCase.java
index 6dce8bf25..4ec514a3c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/BooleanAttributeTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/BooleanAttributeTestCase.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.headerblock;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.ts.soap.HeaderBlockAttribute;
 import org.apache.axiom.ts.soap.SOAPSpec;
 import org.apache.axiom.ts.soap.SOAPTestCase;
@@ -26,9 +25,8 @@ import org.apache.axiom.ts.soap.SOAPTestCase;
 public abstract class BooleanAttributeTestCase extends SOAPTestCase {
     protected final HeaderBlockAttribute attribute;
 
-    public BooleanAttributeTestCase(
-            OMMetaFactory metaFactory, SOAPSpec spec, HeaderBlockAttribute attribute) {
-        super(metaFactory, spec);
+    public BooleanAttributeTestCase(SOAPSpec spec, HeaderBlockAttribute attribute) {
+        super(spec);
         this.attribute = attribute;
     }
 }
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java
index 1e322825e..76d0890fd 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.axiom.blob.Blobs;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMSourcedElement;
@@ -42,8 +41,8 @@ public class TestBlobOMDataSource extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestBlobOMDataSource(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestBlobOMDataSource(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java
index 6a56887a9..c39712181 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.headerblock;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPCloneOptions;
 import org.apache.axiom.soap.SOAPFactory;
@@ -39,11 +38,8 @@ public class TestClone extends SOAPTestCase {
     private final Boolean processed;
 
     @Inject
-    public TestClone(
-            OMMetaFactory metaFactory,
-            SOAPSpec spec,
-            @Named("processed") @Nullable Boolean processed) {
-        super(metaFactory, spec);
+    public TestClone(SOAPSpec spec, @Named("processed") @Nullable Boolean processed) {
+        super(spec);
         this.processed = processed;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java
index eaf5cf69c..4971cf2ef 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.headerblock;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPCloneOptions;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -40,8 +39,8 @@ public class TestCloneProcessedWithoutPreservingModel extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestCloneProcessedWithoutPreservingModel(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestCloneProcessedWithoutPreservingModel(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttribute.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttribute.java
index 686c1e036..2c3774433 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttribute.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttribute.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.headerblock;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -38,11 +37,8 @@ public class TestGetBooleanAttribute extends BooleanAttributeTestCase {
 
     @Inject
     public TestGetBooleanAttribute(
-            OMMetaFactory metaFactory,
-            SOAPSpec spec,
-            HeaderBlockAttribute attribute,
-            BooleanLiteral literal) {
-        super(metaFactory, spec, attribute);
+            SOAPSpec spec, HeaderBlockAttribute attribute, BooleanLiteral literal) {
+        super(spec, attribute);
         this.literal = literal;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeDefault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeDefault.java
index 7d43b08e7..6635e1c6d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeDefault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeDefault.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.headerblock;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -39,9 +38,8 @@ public class TestGetBooleanAttributeDefault extends BooleanAttributeTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetBooleanAttributeDefault(
-            OMMetaFactory metaFactory, SOAPSpec spec, HeaderBlockAttribute attribute) {
-        super(metaFactory, spec, attribute);
+    public TestGetBooleanAttributeDefault(SOAPSpec spec, HeaderBlockAttribute attribute) {
+        super(spec, attribute);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java
index 3fa48eece..acfd37d76 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -46,11 +45,8 @@ public class TestGetBooleanAttributeInvalid extends BooleanAttributeTestCase {
 
     @Inject
     public TestGetBooleanAttributeInvalid(
-            OMMetaFactory metaFactory,
-            SOAPSpec spec,
-            HeaderBlockAttribute attribute,
-            @Named("value") String value) {
-        super(metaFactory, spec, attribute);
+            SOAPSpec spec, HeaderBlockAttribute attribute, @Named("value") String value) {
+        super(spec, attribute);
         this.value = value;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeUnspported.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeUnspported.java
index c40f08130..f25e5ee46 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeUnspported.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeUnspported.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -40,9 +39,8 @@ public class TestGetBooleanAttributeUnspported extends BooleanAttributeTestCase
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetBooleanAttributeUnspported(
-            OMMetaFactory metaFactory, SOAPSpec spec, HeaderBlockAttribute attribute) {
-        super(metaFactory, spec, attribute);
+    public TestGetBooleanAttributeUnspported(SOAPSpec spec, HeaderBlockAttribute attribute) {
+        super(spec, attribute);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetMustUnderstandWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetMustUnderstandWithParser.java
index 9bd70919e..8648257b4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetMustUnderstandWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetMustUnderstandWithParser.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.headerblock;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -31,8 +30,8 @@ import com.google.inject.Inject;
 
 public class TestGetMustUnderstandWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetMustUnderstandWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.HEADERS);
+    public TestGetMustUnderstandWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.HEADERS);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java
index eb3d254c8..735eb7e0f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRole.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.headerblock;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -33,8 +32,8 @@ public class TestGetRole extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetRole(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetRole(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRoleWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRoleWithParser.java
index 97e249f54..353709b27 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRoleWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetRoleWithParser.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.headerblock;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -31,8 +30,8 @@ import com.google.inject.Inject;
 
 public class TestGetRoleWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetRoleWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec, SOAPSampleSet.HEADERS);
+    public TestGetRoleWithParser(SOAPSpec spec) {
+        super(spec, SOAPSampleSet.HEADERS);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetVersion.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetVersion.java
index f64329a4b..58238c47e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetVersion.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetVersion.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.headerblock;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.soap.SOAPVersion;
@@ -31,8 +30,8 @@ public class TestGetVersion extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetVersion(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetVersion(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java
index 10e8fc120..c2c3b90b3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.headerblock;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -47,9 +46,8 @@ public class TestSetAttributeNamespacePrefix extends SOAPTestCase {
     private final HeaderBlockAttribute attribute;
 
     @Inject
-    public TestSetAttributeNamespacePrefix(
-            OMMetaFactory metaFactory, SOAPSpec spec, HeaderBlockAttribute attribute) {
-        super(metaFactory, spec);
+    public TestSetAttributeNamespacePrefix(SOAPSpec spec, HeaderBlockAttribute attribute) {
+        super(spec);
         this.attribute = attribute;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java
index 4ab469f37..8656c806e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttribute.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.headerblock;
 import java.util.Iterator;
 
 import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -41,11 +40,8 @@ public class TestSetBooleanAttribute extends BooleanAttributeTestCase {
 
     @Inject
     public TestSetBooleanAttribute(
-            OMMetaFactory metaFactory,
-            SOAPSpec spec,
-            HeaderBlockAttribute attribute,
-            @Named("value") boolean value) {
-        super(metaFactory, spec, attribute);
+            SOAPSpec spec, HeaderBlockAttribute attribute, @Named("value") boolean value) {
+        super(spec, attribute);
         this.value = value;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttributeUnsupported.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttributeUnsupported.java
index b9a4c4275..54c288508 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttributeUnsupported.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetBooleanAttributeUnsupported.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -36,9 +35,8 @@ public class TestSetBooleanAttributeUnsupported extends BooleanAttributeTestCase
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetBooleanAttributeUnsupported(
-            OMMetaFactory metaFactory, SOAPSpec spec, HeaderBlockAttribute attribute) {
-        super(metaFactory, spec, attribute);
+    public TestSetBooleanAttributeUnsupported(SOAPSpec spec, HeaderBlockAttribute attribute) {
+        super(spec, attribute);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
index dd05ac3df..2dd522ebd 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRole.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap.headerblock;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -33,8 +32,8 @@ public class TestSetRole extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetRole(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSetRole(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRoleWithoutExistingNamespaceDecl.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRoleWithoutExistingNamespaceDecl.java
index 2806de90d..21e699a0f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRoleWithoutExistingNamespaceDecl.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetRoleWithoutExistingNamespaceDecl.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.headerblock;
 import static org.apache.axiom.truth.AxiomTruth.assertThat;
 
 import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.ts.soap.HeaderBlockAttribute;
@@ -35,8 +34,8 @@ public class TestSetRoleWithoutExistingNamespaceDecl extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetRoleWithoutExistingNamespaceDecl(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSetRoleWithoutExistingNamespaceDecl(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
index a4b011118..e481219a1 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent1.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.headerblock;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.apache.axiom.om.OMContainer;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
@@ -41,8 +40,8 @@ public class TestWrongParent1 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestWrongParent1(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestWrongParent1(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
index ecc905a42..3e7539f46 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent2.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.headerblock;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
@@ -41,8 +40,8 @@ public class TestWrongParent2 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestWrongParent2(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestWrongParent2(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
index 8b6610322..a9b5e3f47 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestWrongParent3.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.headerblock;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultDetail;
@@ -41,8 +40,8 @@ public class TestWrongParent3 extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestWrongParent3(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestWrongParent3(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestClone.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestClone.java
index b857b1a61..e5ff23d1a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestClone.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestClone.java
@@ -22,7 +22,6 @@ import org.apache.axiom.om.OMCloneOptions;
 import org.apache.axiom.om.OMDocument;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMInformationItem;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPMessage;
@@ -43,11 +42,8 @@ public class TestClone extends SOAPTestCase {
     private final boolean preserveModel;
 
     @Inject
-    public TestClone(
-            OMMetaFactory metaFactory,
-            SOAPSpec spec,
-            @Named("preserveModel") boolean preserveModel) {
-        super(metaFactory, spec);
+    public TestClone(SOAPSpec spec, @Named("preserveModel") boolean preserveModel) {
+        super(spec);
         this.preserveModel = preserveModel;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
index 23dd0ec95..e6b6e8339 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
@@ -38,16 +38,14 @@ import com.google.inject.name.Named;
  * returns the correct factory (which is determined lazily) on the clone.
  */
 public class TestCloneIncomplete extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
     @Inject private SOAPFactory soapFactory;
 
     private final boolean preserveModel;
 
     @Inject
-    public TestCloneIncomplete(
-            OMMetaFactory metaFactory,
-            SOAPSpec spec,
-            @Named("preserveModel") boolean preserveModel) {
-        super(metaFactory, spec);
+    public TestCloneIncomplete(SOAPSpec spec, @Named("preserveModel") boolean preserveModel) {
+        super(spec);
         this.preserveModel = preserveModel;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java
index 695e4850c..62065f8c3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java
@@ -35,11 +35,12 @@ import com.google.inject.Inject;
 
 /** Tests {@link OMDocument#getCharsetEncoding()} on a {@link SOAPMessage} created by a builder. */
 public class TestGetCharsetEncodingWithParser extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetCharsetEncodingWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetCharsetEncodingWithParser(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
index 747519de8..34b70c864 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
@@ -35,11 +35,12 @@ import com.google.inject.Inject;
  * factory is auto-detected based on the namespace URI of the SOAP envelope.
  */
 public class TestGetOMFactoryWithParser extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetOMFactoryWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestGetOMFactoryWithParser(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElement.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElement.java
index 40f180f23..8fde0a244 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElement.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElement.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap.message;
 
 import org.apache.axiom.om.OMDocument;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPMessage;
@@ -37,8 +36,8 @@ public class TestSetOMDocumentElement extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetOMDocumentElement(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSetOMDocumentElement(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java
index e97445ddb..ef092780c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestSetOMDocumentElementNonSOAPEnvelope.java
@@ -25,7 +25,6 @@ import javax.xml.namespace.QName;
 import org.apache.axiom.om.OMDocument;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPMessage;
@@ -43,8 +42,8 @@ public class TestSetOMDocumentElementNonSOAPEnvelope extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetOMDocumentElementNonSOAPEnvelope(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestSetOMDocumentElementNonSOAPEnvelope(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/GetSetChildTestCase.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/GetSetChildTestCase.java
index dfaeefd21..e9c49eab7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/GetSetChildTestCase.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/GetSetChildTestCase.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.misc;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPElementType;
 import org.apache.axiom.ts.soap.SOAPElementTypeAdapter;
@@ -34,12 +33,8 @@ public abstract class GetSetChildTestCase extends SOAPTestCase {
     protected final SOAPElementType type;
     protected final SOAPElementType childType;
 
-    public GetSetChildTestCase(
-            OMMetaFactory metaFactory,
-            SOAPSpec spec,
-            SOAPElementType type,
-            SOAPElementType childType) {
-        super(metaFactory, spec);
+    public GetSetChildTestCase(SOAPSpec spec, SOAPElementType type, SOAPElementType childType) {
+        super(spec);
         this.type = type;
         this.childType = childType;
     }
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestGetChild.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestGetChild.java
index 65559d602..88259adeb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestGetChild.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestGetChild.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.misc;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPElementType;
 import org.apache.axiom.ts.soap.SOAPElementTypeAdapter;
@@ -33,11 +32,10 @@ public class TestGetChild extends GetSetChildTestCase {
 
     @Inject
     public TestGetChild(
-            OMMetaFactory metaFactory,
             SOAPSpec spec,
             @Named("type") SOAPElementType type,
             @Named("childType") SOAPElementType childType) {
-        super(metaFactory, spec, type, childType);
+        super(spec, type, childType);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChild.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChild.java
index 775ada2c9..c5638568c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChild.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChild.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.misc;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.ts.soap.SOAPElementType;
 import org.apache.axiom.ts.soap.SOAPElementTypeAdapter;
@@ -33,11 +32,10 @@ public class TestSetChild extends GetSetChildTestCase {
 
     @Inject
     public TestSetChild(
-            OMMetaFactory metaFactory,
             SOAPSpec spec,
             @Named("type") SOAPElementType type,
             @Named("childType") SOAPElementType childType) {
-        super(metaFactory, spec, type, childType);
+        super(spec, type, childType);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChildVersionMismatch.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChildVersionMismatch.java
index 534fb6735..b2e20e9d3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChildVersionMismatch.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/misc/TestSetChildVersionMismatch.java
@@ -21,7 +21,6 @@ package org.apache.axiom.ts.soap.misc;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPProcessingException;
 import org.apache.axiom.ts.soap.AltSOAPFactory;
@@ -37,11 +36,10 @@ public class TestSetChildVersionMismatch extends GetSetChildTestCase {
 
     @Inject
     public TestSetChildVersionMismatch(
-            OMMetaFactory metaFactory,
             SOAPSpec spec,
             @Named("type") SOAPElementType type,
             @Named("childType") SOAPElementType childType) {
-        super(metaFactory, spec, type, childType);
+        super(spec, type, childType);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/xpath/TestXPathAppliedToSOAPEnvelope.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/xpath/TestXPathAppliedToSOAPEnvelope.java
index fbe091f48..3e6435178 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/xpath/TestXPathAppliedToSOAPEnvelope.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/xpath/TestXPathAppliedToSOAPEnvelope.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap.xpath;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.xpath.AXIOMXPath;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -38,10 +37,8 @@ public class TestXPathAppliedToSOAPEnvelope extends SOAPTestCase {
 
     @Inject
     public TestXPathAppliedToSOAPEnvelope(
-            OMMetaFactory metaFactory,
-            SOAPSpec spec,
-            @Named("createDocument") boolean createDocument) {
-        super(metaFactory, spec);
+            SOAPSpec spec, @Named("createDocument") boolean createDocument) {
+        super(spec);
         this.createDocument = createDocument;
     }
 
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java
index bcac2da9d..faa51f0ca 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestGetNode.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap11.fault;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -34,8 +33,8 @@ public class TestGetNode extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetNode(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP11);
+    public TestGetNode() {
+        super(SOAPSpec.SOAP11);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java
index ab5a3945a..819a6bb81 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/fault/TestSetNode.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap11.fault;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.ts.soap.SOAPSpec;
@@ -32,8 +31,8 @@ public class TestSetNode extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetNode(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP11);
+    public TestSetNode() {
+        super(SOAPSpec.SOAP11);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValue.java
index f40fe5f45..3c1a95819 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValue.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap11.faultcode;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
@@ -39,8 +38,8 @@ public class TestGetValue extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetValue(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP11);
+    public TestGetValue() {
+        super(SOAPSpec.SOAP11);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java
index 6d414fcb8..b89997d3b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestGetValueWithParser.java
@@ -19,7 +19,6 @@
 package org.apache.axiom.ts.soap11.faultcode;
 
 import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultCode;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
@@ -28,8 +27,8 @@ import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
 public class TestGetValueWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetValueWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP11, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetValueWithParser() {
+        super(SOAPSpec.SOAP11, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestSetValueFromQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestSetValueFromQName.java
index 3729adfd6..e2f9c2135 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestSetValueFromQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultcode/TestSetValueFromQName.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultClassifier;
@@ -40,8 +39,8 @@ public class TestSetValueFromQName extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetValueFromQName(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP11);
+    public TestSetValueFromQName() {
+        super(SOAPSpec.SOAP11);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestAddSOAPText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestAddSOAPText.java
index 8339be798..08b560fb9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestAddSOAPText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestAddSOAPText.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap11.faultreason;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.soap.SOAPFaultReason;
@@ -31,8 +30,8 @@ public class TestAddSOAPText extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddSOAPText(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP11);
+    public TestAddSOAPText() {
+        super(SOAPSpec.SOAP11);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java
index 15464f5cd..edd33f1b5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetFirstSOAPText.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap11.faultreason;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.soap.SOAPFaultReason;
@@ -33,8 +32,8 @@ public class TestGetFirstSOAPText extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetFirstSOAPText(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP11);
+    public TestGetFirstSOAPText() {
+        super(SOAPSpec.SOAP11);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java
index 2878da419..da549e46e 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java
@@ -37,9 +37,11 @@ import org.apache.axiom.ts.AxiomTestCase;
 import com.google.inject.Inject;
 
 public class TestGetTextWithCDATA extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     @Inject
-    public TestGetTextWithCDATA(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP11);
+    public TestGetTextWithCDATA() {
+        super(SOAPSpec.SOAP11);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/factory/TestCreateSOAPFaultSubCode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/factory/TestCreateSOAPFaultSubCode.java
index 12cf5703e..995015599 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/factory/TestCreateSOAPFaultSubCode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/factory/TestCreateSOAPFaultSubCode.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap12.factory;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -42,8 +41,8 @@ public class TestCreateSOAPFaultSubCode extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestCreateSOAPFaultSubCode(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestCreateSOAPFaultSubCode() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java
index 680959d43..b577282bb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNode.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap12.fault;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
@@ -31,8 +30,8 @@ public class TestGetNode extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetNode(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestGetNode() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNodeWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNodeWithParser.java
index 0f2d0f4f9..0d7776356 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNodeWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestGetNodeWithParser.java
@@ -18,18 +18,18 @@
  */
 package org.apache.axiom.ts.soap12.fault;
 
-import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.ts.soap.SOAPSample;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetNodeWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetNodeWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSample.SOAP12_FAULT);
+    public TestGetNodeWithParser() {
+        super(SOAPSample.SOAP12_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestMoreChildrenAddition.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestMoreChildrenAddition.java
index 4d9b4299f..be8154558 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestMoreChildrenAddition.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestMoreChildrenAddition.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap12.fault;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultCode;
@@ -31,8 +30,8 @@ public class TestMoreChildrenAddition extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestMoreChildrenAddition(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestMoreChildrenAddition() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
index cd15a4053..1a8d0a675 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/fault/TestSetNode.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap12.fault;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
@@ -35,8 +34,8 @@ public class TestSetNode extends SOAPTestCase {
     @Inject @AltSOAPFactory private SOAPFactory altSoapFactory;
 
     @Inject
-    public TestSetNode(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestSetNode() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetSubCodeWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetSubCodeWithParser.java
index 905729682..a04fe543b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetSubCodeWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetSubCodeWithParser.java
@@ -18,18 +18,18 @@
  */
 package org.apache.axiom.ts.soap12.faultcode;
 
-import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultCode;
 import org.apache.axiom.ts.soap.SOAPSample;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetSubCodeWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetSubCodeWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSample.SOAP12_FAULT);
+    public TestGetSubCodeWithParser() {
+        super(SOAPSample.SOAP12_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetValueWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetValueWithParser.java
index 01d8ebf15..758be622c 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetValueWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestGetValueWithParser.java
@@ -18,8 +18,6 @@
  */
 package org.apache.axiom.ts.soap12.faultcode;
 
-import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultCode;
@@ -27,10 +25,12 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
 import org.apache.axiom.ts.soap.SOAPSpec;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetValueWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetValueWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetValueWithParser() {
+        super(SOAPSpec.SOAP12, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQName.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQName.java
index 63bdae8fe..8baebd3f3 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQName.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQName.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultClassifier;
@@ -41,8 +40,8 @@ public class TestSetValueFromQName extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetValueFromQName(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestSetValueFromQName() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQNameWithExistingValue.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQNameWithExistingValue.java
index 095e4bbf8..b27a9d019 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQNameWithExistingValue.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultcode/TestSetValueFromQNameWithExistingValue.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultClassifier;
@@ -41,8 +40,8 @@ public class TestSetValueFromQNameWithExistingValue extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestSetValueFromQNameWithExistingValue(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestSetValueFromQNameWithExistingValue() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPText.java
index b35381a35..4d29c2902 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPText.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap12.faultreason;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.soap.SOAPFaultReason;
@@ -31,8 +30,8 @@ public class TestAddSOAPText extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddSOAPText(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestAddSOAPText() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java
index 7f3bc18a2..0b811f599 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap12.faultreason;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultReason;
@@ -34,8 +33,8 @@ public class TestAddSOAPTextMultiple extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestAddSOAPTextMultiple(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestAddSOAPTextMultiple() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java
index aee2cb336..cfd7af6ca 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextWithSOAPVersionMismatch.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap12.faultreason;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.soap.SOAPFaultReason;
@@ -35,8 +34,8 @@ public class TestAddSOAPTextWithSOAPVersionMismatch extends SOAPTestCase {
     @Inject @AltSOAPFactory private SOAPFactory altSoapFactory;
 
     @Inject
-    public TestAddSOAPTextWithSOAPVersionMismatch(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestAddSOAPTextWithSOAPVersionMismatch() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetAllSoapTextsWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetAllSoapTextsWithParser.java
index 84634483d..c7f826bc7 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetAllSoapTextsWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetAllSoapTextsWithParser.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultText;
 import org.apache.axiom.ts.soap.SOAPSample;
@@ -32,8 +31,8 @@ import com.google.inject.Inject;
 
 public class TestGetAllSoapTextsWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetAllSoapTextsWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSample.SOAP12_FAULT);
+    public TestGetAllSoapTextsWithParser() {
+        super(SOAPSample.SOAP12_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonText.java
index f48b3d39c..ee68017cb 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonText.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Locale;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultReason;
 import org.apache.axiom.ts.soap.SOAPSample;
@@ -32,8 +31,8 @@ import com.google.inject.Inject;
 
 public class TestGetFaultReasonText extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetFaultReasonText(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSample.SOAP12_FAULT);
+    public TestGetFaultReasonText() {
+        super(SOAPSample.SOAP12_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java
index cda20162e..47b4dc038 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Locale;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultReason;
 import org.apache.axiom.soap.SOAPFaultText;
@@ -35,8 +34,8 @@ public class TestGetFaultReasonTextCaseSensitivity extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetFaultReasonTextCaseSensitivity(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestGetFaultReasonTextCaseSensitivity() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java
index bd46daabc..3f4d5d11b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Locale;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFaultReason;
 import org.apache.axiom.soap.SOAPFaultText;
@@ -35,8 +34,8 @@ public class TestGetFaultReasonTextWithoutLangAttribute extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetFaultReasonTextWithoutLangAttribute(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestGetFaultReasonTextWithoutLangAttribute() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPText.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPText.java
index a60d3e828..ad1b0cdf0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPText.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPText.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axiom.ts.soap12.faultreason;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.soap.SOAPFaultReason;
@@ -31,8 +30,8 @@ public class TestGetFirstSOAPText extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestGetFirstSOAPText(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestGetFirstSOAPText() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPTextWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPTextWithParser.java
index 1cad15826..180e6ac02 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPTextWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFirstSOAPTextWithParser.java
@@ -18,18 +18,18 @@
  */
 package org.apache.axiom.ts.soap12.faultreason;
 
-import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultReason;
 import org.apache.axiom.ts.soap.SOAPSampleSet;
 import org.apache.axiom.ts.soap.SOAPSpec;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetFirstSOAPTextWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetFirstSOAPTextWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetFirstSOAPTextWithParser() {
+        super(SOAPSpec.SOAP12, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetSubCodeNestedWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetSubCodeNestedWithParser.java
index eef2a7b4b..4cfc46d9a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetSubCodeNestedWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetSubCodeNestedWithParser.java
@@ -18,18 +18,18 @@
  */
 package org.apache.axiom.ts.soap12.faultsubcode;
 
-import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultSubCode;
 import org.apache.axiom.ts.soap.SOAPSample;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetSubCodeNestedWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetSubCodeNestedWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSample.SOAP12_FAULT);
+    public TestGetSubCodeNestedWithParser() {
+        super(SOAPSample.SOAP12_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetSubCodeWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetSubCodeWithParser.java
index 6bde929c2..f124a79c2 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetSubCodeWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetSubCodeWithParser.java
@@ -18,18 +18,18 @@
  */
 package org.apache.axiom.ts.soap12.faultsubcode;
 
-import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultSubCode;
 import org.apache.axiom.ts.soap.SOAPSample;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetSubCodeWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetSubCodeWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSample.SOAP12_FAULT);
+    public TestGetSubCodeWithParser() {
+        super(SOAPSample.SOAP12_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueAsQNameWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueAsQNameWithParser.java
index 4fe86434d..1b0d7a559 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueAsQNameWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueAsQNameWithParser.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap12.faultsubcode;
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultClassifier;
 import org.apache.axiom.soap.SOAPFaultSubCode;
@@ -35,8 +34,8 @@ import com.google.inject.Inject;
  */
 public class TestGetValueAsQNameWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetValueAsQNameWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSample.SOAP12_FAULT);
+    public TestGetValueAsQNameWithParser() {
+        super(SOAPSample.SOAP12_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueNestedWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueNestedWithParser.java
index 0807d4613..4e95425a0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueNestedWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueNestedWithParser.java
@@ -18,17 +18,17 @@
  */
 package org.apache.axiom.ts.soap12.faultsubcode;
 
-import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultSubCode;
 import org.apache.axiom.ts.soap.SOAPSample;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetValueNestedWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetValueNestedWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSample.SOAP12_FAULT);
+    public TestGetValueNestedWithParser() {
+        super(SOAPSample.SOAP12_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueWithParser.java
index c2f5bb92b..ca83a1378 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultsubcode/TestGetValueWithParser.java
@@ -18,17 +18,17 @@
  */
 package org.apache.axiom.ts.soap12.faultsubcode;
 
-import com.google.inject.Inject;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultSubCode;
 import org.apache.axiom.ts.soap.SOAPSample;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetValueWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetValueWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSample.SOAP12_FAULT);
+    public TestGetValueWithParser() {
+        super(SOAPSample.SOAP12_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faulttext/TestGetLangWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faulttext/TestGetLangWithParser.java
index 81d41675e..ec9adab46 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faulttext/TestGetLangWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faulttext/TestGetLangWithParser.java
@@ -18,9 +18,7 @@
  */
 package org.apache.axiom.ts.soap12.faulttext;
 
-import com.google.inject.Inject;
 import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFaultText;
@@ -28,10 +26,12 @@ import org.apache.axiom.ts.soap.SOAPSampleSet;
 import org.apache.axiom.ts.soap.SOAPSpec;
 import org.apache.axiom.ts.soap.SampleBasedSOAPTestCase;
 
+import com.google.inject.Inject;
+
 public class TestGetLangWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetLangWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12, SOAPSampleSet.SIMPLE_FAULT);
+    public TestGetLangWithParser() {
+        super(SOAPSpec.SOAP12, SOAPSampleSet.SIMPLE_FAULT);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/header/TestExamineMustUnderstandHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/header/TestExamineMustUnderstandHeaderBlocks.java
index 0c349c3bb..0d92e3546 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/header/TestExamineMustUnderstandHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/header/TestExamineMustUnderstandHeaderBlocks.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap12.header;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -35,8 +34,8 @@ public class TestExamineMustUnderstandHeaderBlocks extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestExamineMustUnderstandHeaderBlocks(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSpec.SOAP12);
+    public TestExamineMustUnderstandHeaderBlocks() {
+        super(SOAPSpec.SOAP12);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRelayWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRelayWithParser.java
index 96d071638..c17e870b8 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRelayWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRelayWithParser.java
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap12.headerblock;
 
 import java.util.Iterator;
 
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPHeaderBlock;
 import org.apache.axiom.ts.soap.SOAPSample;
@@ -30,8 +29,8 @@ import com.google.inject.Inject;
 
 public class TestGetRelayWithParser extends SampleBasedSOAPTestCase {
     @Inject
-    public TestGetRelayWithParser(OMMetaFactory metaFactory) {
-        super(metaFactory, SOAPSample.SOAP12_RELAY);
+    public TestGetRelayWithParser() {
+        super(SOAPSample.SOAP12_RELAY);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java
index 463e90ba7..bbaae8410 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
 import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -45,8 +44,8 @@ public class TestExamineAllHeaderBlocks extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestExamineAllHeaderBlocks(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestExamineAllHeaderBlocks(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineMustUnderstandHeaderBlocks.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineMustUnderstandHeaderBlocks.java
index 72faea582..002340d46 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineMustUnderstandHeaderBlocks.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineMustUnderstandHeaderBlocks.java
@@ -25,7 +25,6 @@ import static org.apache.axiom.truth.xml.XMLTruth.xml;
 import java.util.Iterator;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.soap.SOAPHeaderBlock;
@@ -40,8 +39,8 @@ public class TestExamineMustUnderstandHeaderBlocks extends SOAPTestCase {
     @Inject private SOAPFactory soapFactory;
 
     @Inject
-    public TestExamineMustUnderstandHeaderBlocks(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestExamineMustUnderstandHeaderBlocks(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java
index 3742c75a0..eb9dc39c0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/message/TestLazySOAPFactorySelection.java
@@ -29,9 +29,11 @@ import org.w3c.dom.Document;
 import com.google.inject.Inject;
 
 public class TestLazySOAPFactorySelection extends SOAPTestCase {
+    @Inject private OMMetaFactory metaFactory;
+
     @Inject
-    public TestLazySOAPFactorySelection(OMMetaFactory metaFactory, SOAPSpec spec) {
-        super(metaFactory, spec);
+    public TestLazySOAPFactorySelection(SOAPSpec spec) {
+        super(spec);
     }
 
     @Override