From f72810088d2c7f3c29fbde185b25cfc72fc1fbcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 20 Dec 2019 18:29:30 +0100
Subject: [PATCH] REVERT ME Remove some diff

---
 pmd-javascript/pom.xml                        |  10 -
 .../pmd/lang/ecmascript/ast/ASTAstRoot.java   |   4 +-
 .../ecmascript/ast/ASTFunctionNodeTest.java   |   4 +-
 .../ecmascript/ast/ASTTryStatementTest.java   |   2 +-
 .../ecmascript/ast/EcmascriptParserTest.java  |  26 +--
 .../ast/EcmascriptParserTestBase.java         |  35 ++--
 .../lang/ecmascript/ast/JsParsingHelper.java  |  25 ---
 pmd-jsp/pom.xml                               |  10 -
 .../pmd/lang/jsp/ast/AbstractJspNodesTst.java |  62 +++++-
 .../pmd/lang/jsp/ast/JspDocStyleTest.java     | 197 +++++++++---------
 .../pmd/lang/jsp/ast/JspPageStyleTest.java    |  38 ++--
 .../pmd/lang/jsp/ast/JspParsingHelper.java    |  25 ---
 pmd-plsql/pom.xml                             |  10 -
 .../lang/plsql/AbstractPLSQLParserTst.java    | 133 +++++++++++-
 .../pmd/lang/plsql/PLSQLParserTest.java       |  77 +++++++
 .../pmd/lang/plsql/PLSQLXPathRuleTest.java    |  14 +-
 .../pmd/lang/plsql/PlsqlParsingHelper.java    |  30 ---
 .../plsql/ast/ASTComparisonConditionTest.java |   2 +-
 .../plsql/ast/ASTCompoundConditionTest.java   |   2 +-
 .../lang/plsql/ast/AnonymousBlockTest.java    |  18 +-
 .../pmd/lang/plsql/ast/CreateTableTest.java   |  17 +-
 .../lang/plsql/ast/CursorAttributesTest.java  |   7 +-
 .../pmd/lang/plsql/ast/CursorForLoopTest.java |  15 +-
 .../lang/plsql/ast/CursorWithWithTest.java    |  10 +-
 .../lang/plsql/ast/DeleteStatementTest.java   |  10 +-
 .../lang/plsql/ast/ExecuteImmediateTest.java  |  18 +-
 .../pmd/lang/plsql/ast/FunctionsTest.java     |  18 +-
 .../pmd/lang/plsql/ast/IfStatementTest.java   |   2 +-
 .../lang/plsql/ast/InsertIntoClauseTest.java  |  25 ++-
 .../pmd/lang/plsql/ast/JoinClauseTest.java    |  68 ++++--
 .../plsql/ast/OrderByExpressionsTest.java     |  11 +-
 .../pmd/lang/plsql/ast/PLSQLParserTest.java   |  76 -------
 .../pmd/lang/plsql/ast/RecordTypeTest.java    |  11 +-
 .../lang/plsql/ast/SelectExpressionsTest.java |  29 ++-
 .../lang/plsql/ast/SelectForUpdateTest.java   |  14 +-
 .../plsql/ast/SelectHierarchicalTest.java     |  11 +-
 .../plsql/ast/SelectIntoStatementTest.java    |  51 +++--
 .../plsql/ast/SelectIntoWithGroupByTest.java  |  26 ++-
 .../pmd/lang/plsql/ast/SelectUnionTest.java   |  11 +-
 .../ast/TableCollectionExpressionTest.java    |  18 +-
 .../plsql/ast/TrimWithRecordTypeTest.java     |  11 +-
 .../lang/plsql/ast/UpdateStatementTest.java   |   7 +-
 .../pmd/lang/plsql/ast/ViewTest.java          |  25 ++-
 .../pmd/lang/plsql/ast/WhereClauseTest.java   |  74 ++++---
 .../pmd/lang/plsql/ast/XMLElementTest.java    |   8 +-
 .../pmd/lang/plsql/ast/XMLTableTest.java      |  10 +-
 .../dfa/StatementAndBraceFinderTest.java      |  35 ++--
 .../pmd/lang/scala/ast/BaseScalaTest.java     |  14 --
 .../lang/scala/ast/ScalaParsingHelper.java    |  56 -----
 .../pmd/lang/scala/rule/ScalaRuleTest.java    |  46 +++-
 .../pmd/lang/scala/rule/XPathRuleTest.java    |  31 ++-
 pmd-visualforce/pom.xml                       |  10 -
 .../sourceforge/pmd/lang/vf/VfParserTest.java |  48 +++++
 .../pmd/lang/vf/ast/AbstractVfNodesTest.java  |  64 +++++-
 .../pmd/lang/vf/ast/VfDocStyleTest.java       | 163 ++++++++-------
 .../pmd/lang/vf/ast/VfPageStyleTest.java      |   8 +-
 .../pmd/lang/vf/ast/VfParserTest.java         |  29 ---
 .../pmd/lang/vf/ast/VfParsingHelper.java      |  22 --
 pmd-xml/pom.xml                               |  10 -
 .../pmd/lang/xml/XmlParserOptionsTest.java    |   4 +-
 .../pmd/lang/xml/XmlParserTest.java           |  75 +++++--
 .../pmd/lang/xml/XmlParsingHelper.java        |  33 ---
 62 files changed, 1169 insertions(+), 786 deletions(-)
 delete mode 100644 pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsParsingHelper.java
 delete mode 100644 pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspParsingHelper.java
 create mode 100644 pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLParserTest.java
 delete mode 100644 pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PlsqlParsingHelper.java
 delete mode 100644 pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTest.java
 delete mode 100644 pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/BaseScalaTest.java
 delete mode 100644 pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java
 create mode 100644 pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/VfParserTest.java
 delete mode 100644 pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfParserTest.java
 delete mode 100644 pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfParsingHelper.java
 delete mode 100644 pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParsingHelper.java

diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index a2df98aeff..28115957d3 100644
--- a/pmd-javascript/pom.xml
+++ b/pmd-javascript/pom.xml
@@ -96,15 +96,5 @@
             <artifactId>pmd-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-lang-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAstRoot.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAstRoot.java
index b4976f84e1..1da66dbed0 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAstRoot.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTAstRoot.java
@@ -6,9 +6,7 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 import org.mozilla.javascript.ast.AstRoot;
 
-import net.sourceforge.pmd.lang.ast.RootNode;
-
-public class ASTAstRoot extends AbstractEcmascriptNode<AstRoot> implements RootNode {
+public class ASTAstRoot extends AbstractEcmascriptNode<AstRoot> {
     public ASTAstRoot(AstRoot astRoot) {
         super(astRoot);
     }
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNodeTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNodeTest.java
index 40726ff26a..ef040c68b2 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNodeTest.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNodeTest.java
@@ -11,7 +11,7 @@ public class ASTFunctionNodeTest extends EcmascriptParserTestBase {
 
     @Test
     public void testGetBody() {
-        ASTAstRoot node = js.parse("function foo() { var a = 'a'; }");
+        ASTAstRoot node = parse("function foo() { var a = 'a'; }");
         ASTFunctionNode fn = node.getFirstDescendantOfType(ASTFunctionNode.class);
         Assert.assertFalse(fn.isClosure());
         EcmascriptNode<?> body = fn.getBody();
@@ -20,7 +20,7 @@ public class ASTFunctionNodeTest extends EcmascriptParserTestBase {
 
     @Test
     public void testGetBodyFunctionClosureExpression() {
-        ASTAstRoot node = js18.parse("(function(x) x*x)");
+        ASTAstRoot node = parse18("(function(x) x*x)");
         ASTFunctionNode fn = node.getFirstDescendantOfType(ASTFunctionNode.class);
         Assert.assertTrue(fn.isClosure());
         EcmascriptNode<?> body = fn.getBody();
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatementTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatementTest.java
index 40dcb6c097..738676eabc 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatementTest.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatementTest.java
@@ -17,7 +17,7 @@ import org.mozilla.javascript.ast.AstRoot;
 public class ASTTryStatementTest extends EcmascriptParserTestBase {
 
     private ASTTryStatement getTryStmt(String js) {
-        EcmascriptNode<AstRoot> node = this.js.parse(js);
+        EcmascriptNode<AstRoot> node = parse(js);
         List<ASTTryStatement> trys = node.findDescendantsOfType(ASTTryStatement.class);
         Assert.assertEquals(1, trys.size());
         ASTTryStatement tryStmt = trys.get(0);
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java
index 15d69e3f72..3c6c300e59 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java
@@ -32,7 +32,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase {
     @Test
     public void testLineNumbers() {
         final String SOURCE_CODE = "function a() {" + PMD.EOL + "  alert('hello');" + PMD.EOL + "}" + PMD.EOL;
-        EcmascriptNode<AstRoot> node = js.parse(SOURCE_CODE);
+        EcmascriptNode<AstRoot> node = parse(SOURCE_CODE);
         assertEquals(1, node.getBeginLine());
         assertEquals(1, node.getBeginColumn());
         assertEquals(3, node.getEndLine());
@@ -69,7 +69,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase {
 
         MyEcmascriptRule rule = new MyEcmascriptRule();
         RuleContext ctx = new RuleContext();
-        rule.apply(Arrays.asList(js.parse(source)), ctx);
+        rule.apply(Arrays.asList(parse(source)), ctx);
 
         assertEquals("Scope from 2 to 4", output.get(0));
         assertEquals("Scope from 4 to 6", output.get(1));
@@ -80,7 +80,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase {
      */
     @Test
     public void testArrayAccess() {
-        EcmascriptNode<AstRoot> node = js.parse("function a() { b['a'] = 1; c[1] = 2; }");
+        EcmascriptNode<AstRoot> node = parse("function a() { b['a'] = 1; c[1] = 2; }");
         List<ASTElementGet> arrays = node.findDescendantsOfType(ASTElementGet.class);
         assertEquals("b", arrays.get(0).getTarget().getImage());
         assertEquals("a", arrays.get(0).getElement().getImage());
@@ -94,9 +94,9 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase {
      */
     @Test
     public void testArrayMethod() {
-        EcmascriptNode<AstRoot> rootNode = js.parse(
-            "function test(){\n" + "  a();      // OK\n" + "  b.c();    // OK\n" + "  d[0]();   // OK\n"
-                + "  e[0].f(); // OK\n" + "  y.z[0](); // FAIL ==> java.lang.NullPointerException\n" + "}");
+        EcmascriptNode<AstRoot> rootNode = parse(
+                "function test(){\n" + "  a();      // OK\n" + "  b.c();    // OK\n" + "  d[0]();   // OK\n"
+                        + "  e[0].f(); // OK\n" + "  y.z[0](); // FAIL ==> java.lang.NullPointerException\n" + "}");
 
         List<ASTFunctionCall> calls = rootNode.findDescendantsOfType(ASTFunctionCall.class);
         List<String> results = new ArrayList<>();
@@ -129,7 +129,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase {
      */
     @Test
     public void testCaseAsIdentifier() {
-        ASTAstRoot rootNode = js.parse("function f(a){\n" + "    a.case.flag = 1;\n" + "    return;\n" + "}");
+        ASTAstRoot rootNode = parse("function f(a){\n" + "    a.case.flag = 1;\n" + "    return;\n" + "}");
         ASTBlock block = rootNode.getFirstDescendantOfType(ASTBlock.class);
         assertFalse(block.jjtGetChild(0) instanceof ASTEmptyExpression);
         assertTrue(block.jjtGetChild(0) instanceof ASTExpressionStatement);
@@ -163,9 +163,9 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase {
      */
     @Test
     public void testVoidKeyword() {
-        ASTAstRoot rootNode = js.parse("function f(matchFn, fieldval, n){\n"
-                                           + "    return (matchFn)?(matcharray = eval(matchFn+\"('\"+fieldval+\"','\"+n.id+\"')\")):void(0);\n"
-                                           + "}\n");
+        ASTAstRoot rootNode = parse("function f(matchFn, fieldval, n){\n"
+                + "    return (matchFn)?(matcharray = eval(matchFn+\"('\"+fieldval+\"','\"+n.id+\"')\")):void(0);\n"
+                + "}\n");
         ASTUnaryExpression unary = rootNode.getFirstDescendantOfType(ASTUnaryExpression.class);
         assertEquals("void", unary.getImage());
     }
@@ -175,9 +175,9 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase {
      */
     @Test
     public void testXorAssignment() {
-        ASTAstRoot rootNode = js.parse("function f() { var x = 2; x ^= 2; x &= 2; x |= 2; "
-                                           + "x &&= true; x ||= false; x *= 2; x /= 2; x %= 2; x += 2; x -= 2; "
-                                           + "x <<= 2; x >>= 2; x >>>= 2; }");
+        ASTAstRoot rootNode = parse("function f() { var x = 2; x ^= 2; x &= 2; x |= 2; "
+                + "x &&= true; x ||= false; x *= 2; x /= 2; x %= 2; x += 2; x -= 2; "
+                + "x <<= 2; x >>= 2; x >>>= 2; }");
         ASTAssignment infix = rootNode.getFirstDescendantOfType(ASTAssignment.class);
         assertEquals("^=", infix.getImage());
     }
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTestBase.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTestBase.java
index cf6eade47e..bb9df1d72d 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTestBase.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTestBase.java
@@ -4,21 +4,32 @@
 
 package net.sourceforge.pmd.lang.ecmascript.ast;
 
-import net.sourceforge.pmd.lang.ParserOptions;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
 import net.sourceforge.pmd.lang.ecmascript.EcmascriptParserOptions;
-import net.sourceforge.pmd.lang.ecmascript.EcmascriptParserOptions.Version;
 
 public abstract class EcmascriptParserTestBase {
-
-    protected final JsParsingHelper js = JsParsingHelper.DEFAULT.withResourceContext(getClass());
-
-    protected final JsParsingHelper js18 = JsParsingHelper.DEFAULT.withResourceContext(getClass())
-                                                                  .withParserOptions(parserVersion(Version.VERSION_1_8));
-
-    public ParserOptions parserVersion(EcmascriptParserOptions.Version version) {
-        EcmascriptParserOptions parserOptions = new EcmascriptParserOptions();
-        parserOptions.setRhinoLanguageVersion(version);
-        return parserOptions;
+    public ASTAstRoot parse(String code) {
+        EcmascriptParser parser = new EcmascriptParser(new EcmascriptParserOptions());
+        Reader sourceCode = new StringReader(code);
+        return (ASTAstRoot) parser.parse(sourceCode);
     }
 
+    public ASTAstRoot parse18(String code) {
+        EcmascriptParserOptions parserOptions = new EcmascriptParserOptions();
+        parserOptions.setRhinoLanguageVersion(EcmascriptParserOptions.Version.VERSION_1_8);
+        EcmascriptParser parser = new EcmascriptParser(parserOptions);
+        Reader sourceCode = new StringReader(code);
+        return (ASTAstRoot) parser.parse(sourceCode);
+    }
+
+    public String dump(EcmascriptNode<?> node) {
+        DumpFacade dumpFacade = new DumpFacade();
+        StringWriter writer = new StringWriter();
+        dumpFacade.initializeWith(writer, "", true, node);
+        dumpFacade.visit(node, "");
+        return writer.toString();
+    }
 }
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsParsingHelper.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsParsingHelper.java
deleted file mode 100644
index 833d9e62ff..0000000000
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsParsingHelper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.ecmascript.ast;
-
-import org.jetbrains.annotations.NotNull;
-
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
-import net.sourceforge.pmd.lang.ecmascript.EcmascriptLanguageModule;
-
-public final class JsParsingHelper extends BaseParsingHelper<JsParsingHelper, ASTAstRoot> {
-
-    public static final JsParsingHelper DEFAULT = new JsParsingHelper(Params.getDefaultProcess());
-
-    private JsParsingHelper(@NotNull Params params) {
-        super(EcmascriptLanguageModule.NAME, ASTAstRoot.class, params);
-    }
-
-    @NotNull
-    @Override
-    protected JsParsingHelper clone(@NotNull Params params) {
-        return new JsParsingHelper(params);
-    }
-}
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index d0dbb6455b..a0052f7229 100644
--- a/pmd-jsp/pom.xml
+++ b/pmd-jsp/pom.xml
@@ -93,20 +93,10 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-lang-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNodesTst.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNodesTst.java
index fd8c4082fb..3cd7977511 100644
--- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNodesTst.java
+++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNodesTst.java
@@ -4,8 +4,68 @@
 
 package net.sourceforge.pmd.lang.jsp.ast;
 
+import static org.junit.Assert.assertEquals;
+
+import java.io.StringReader;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.sourceforge.pmd.lang.ast.JavaCharStream;
+import net.sourceforge.pmd.lang.ast.Node;
+
 public abstract class AbstractJspNodesTst {
 
-    protected JspParsingHelper jsp = JspParsingHelper.DEFAULT.withResourceContext(getClass());
+    public <T extends JspNode> void assertNumberOfNodes(Class<T> clazz, String source, int number) {
+        Set<T> nodes = getNodes(clazz, source);
+        assertEquals("Exactly " + number + " element(s) expected", number, nodes.size());
+    }
+
+    /**
+     * Run the JSP parser on the source, and return the nodes of type clazz.
+     *
+     * @param clazz
+     * @param source
+     * @return Set
+     */
+    public <T extends JspNode> Set<T> getNodes(Class<T> clazz, String source) {
+        JspParser parser = new JspParser(new JavaCharStream(new StringReader(source)));
+        Node rootNode = parser.CompilationUnit();
+        Set<T> nodes = new HashSet<>();
+        addNodeAndSubnodes(rootNode, nodes, clazz);
+        return nodes;
+    }
+
+    /**
+     * Return a subset of allNodes, containing the items in allNodes that are of
+     * the given type.
+     *
+     * @param clazz
+     * @param allNodes
+     * @return Set
+     */
+    public <T extends JspNode> Set<T> getNodesOfType(Class<T> clazz, Set<JspNode> allNodes) {
+        Set<T> result = new HashSet<>();
+        for (Node node : allNodes) {
+            if (clazz.equals(node.getClass())) {
+                result.add((T) node);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Add the given node and its subnodes to the set of nodes. If clazz is not
+     * null, only nodes of the given class are put in the set of nodes.
+     */
+    private <T extends JspNode> void addNodeAndSubnodes(Node node, Set<T> nodes, Class<T> clazz) {
+        if (null != node) {
+            if ((null == clazz) || (clazz.equals(node.getClass()))) {
+                nodes.add((T) node);
+            }
+            for (int i = 0; i < node.jjtGetNumChildren(); i++) {
+                addNodeAndSubnodes(node.jjtGetChild(i), nodes, clazz);
+            }
+        }
+    }
 
 }
diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java
index 26a54a3f8b..c62d1fc5b5 100644
--- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java
+++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java
@@ -9,11 +9,11 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -33,8 +33,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testSimplestJsp() {
-        List<ASTElement> nodes = jsp.getNodes(ASTElement.class, TEST_SIMPLEST_HTML);
-        assertEquals("Exactly " + 1 + " element(s) expected", 1, nodes.size());
+        assertNumberOfNodes(ASTElement.class, TEST_SIMPLEST_HTML, 1);
     }
 
     /**
@@ -42,22 +41,22 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testElementAttributeAndNamespace() {
-        ASTCompilationUnit root = jsp.parse(TEST_ELEMENT_AND_NAMESPACE);
+        Set<JspNode> nodes = getNodes(null, TEST_ELEMENT_AND_NAMESPACE);
 
-        List<ASTElement> elementNodes = root.findDescendantsOfType(ASTElement.class);
+        Set<ASTElement> elementNodes = getNodesOfType(ASTElement.class, nodes);
         assertEquals("One element node expected!", 1, elementNodes.size());
-        ASTElement element = elementNodes.get(0);
+        ASTElement element = elementNodes.iterator().next();
         assertEquals("Correct name expected!", "h:html", element.getName());
-        assertTrue("Has namespace prefix!", element.isHasNamespacePrefix());
-        assertTrue("Element is empty!", element.isEmpty());
+        assertEquals("Has namespace prefix!", true, element.isHasNamespacePrefix());
+        assertEquals("Element is empty!", true, element.isEmpty());
         assertEquals("Correct namespace prefix of element expected!", "h", element.getNamespacePrefix());
         assertEquals("Correct local name of element expected!", "html", element.getLocalName());
 
-        List<ASTAttribute> attributeNodes = root.findDescendantsOfType(ASTAttribute.class);
+        Set<ASTAttribute> attributeNodes = getNodesOfType(ASTAttribute.class, nodes);
         assertEquals("One attribute node expected!", 1, attributeNodes.size());
-        ASTAttribute attribute = attributeNodes.get(0);
+        ASTAttribute attribute = attributeNodes.iterator().next();
         assertEquals("Correct name expected!", "MyNsPrefix:MyAttr", attribute.getName());
-        assertTrue("Has namespace prefix!", attribute.isHasNamespacePrefix());
+        assertEquals("Has namespace prefix!", true, attribute.isHasNamespacePrefix());
         assertEquals("Correct namespace prefix of element expected!", "MyNsPrefix", attribute.getNamespacePrefix());
         assertEquals("Correct local name of element expected!", "MyAttr", attribute.getLocalName());
 
@@ -70,26 +69,32 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testAttributeValueContainingHash() {
-        ASTCompilationUnit root = jsp.parse(TEST_ATTRIBUTE_VALUE_CONTAINING_HASH);
+        Set<JspNode> nodes = getNodes(null, TEST_ATTRIBUTE_VALUE_CONTAINING_HASH);
 
-        List<ASTAttribute> attrsList = root.findDescendantsOfType(ASTAttribute.class);
-        assertEquals("Three attributes expected!", 3, attrsList.size());
+        Set<ASTAttribute> attributes = getNodesOfType(ASTAttribute.class, nodes);
+        assertEquals("Three attributes expected!", 3, attributes.size());
+
+        List<ASTAttribute> attrsList = new ArrayList<>(attributes);
+        Collections.sort(attrsList, new Comparator<ASTAttribute>() {
+            public int compare(ASTAttribute arg0, ASTAttribute arg1) {
+                return arg0.getName().compareTo(arg1.getName());
+            }
+        });
 
         ASTAttribute attr = attrsList.get(0);
-
-        assertEquals("Correct attribute name expected!", "something", attr.getName());
-        assertEquals("Correct attribute value expected!", "#yes#",
-                     attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage());
-
-        attr = attrsList.get(1);
         assertEquals("Correct attribute name expected!", "foo", attr.getName());
         assertEquals("Correct attribute value expected!", "CREATE",
-                     attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage());
+                attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage());
 
-        attr = attrsList.get(2);
+        attr = attrsList.get(1);
         assertEquals("Correct attribute name expected!", "href", attr.getName());
         assertEquals("Correct attribute value expected!", "#",
-                     attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage());
+                attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage());
+
+        attr = attrsList.get(2);
+        assertEquals("Correct attribute name expected!", "something", attr.getName());
+        assertEquals("Correct attribute value expected!", "#yes#",
+                attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage());
     }
 
     /**
@@ -97,10 +102,10 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testCData() {
-        List<ASTCData> cdataNodes = jsp.getNodes(ASTCData.class, TEST_CDATA);
+        Set<ASTCData> cdataNodes = getNodes(ASTCData.class, TEST_CDATA);
 
         assertEquals("One CDATA node expected!", 1, cdataNodes.size());
-        ASTCData cdata = cdataNodes.get(0);
+        ASTCData cdata = cdataNodes.iterator().next();
         assertEquals("Content incorrectly parsed!", " some <cdata> ]] ]> ", cdata.getImage());
     }
 
@@ -109,14 +114,14 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testDoctype() {
-        ASTCompilationUnit root = jsp.parse(TEST_DOCTYPE);
+        Set<JspNode> nodes = getNodes(null, TEST_DOCTYPE);
 
-        List<ASTDoctypeDeclaration> docTypeDeclarations = root.findDescendantsOfType(ASTDoctypeDeclaration.class);
+        Set<ASTDoctypeDeclaration> docTypeDeclarations = getNodesOfType(ASTDoctypeDeclaration.class, nodes);
         assertEquals("One doctype declaration expected!", 1, docTypeDeclarations.size());
         ASTDoctypeDeclaration docTypeDecl = docTypeDeclarations.iterator().next();
         assertEquals("Correct doctype-name expected!", "html", docTypeDecl.getName());
 
-        List<ASTDoctypeExternalId> externalIds = root.findDescendantsOfType(ASTDoctypeExternalId.class);
+        Set<ASTDoctypeExternalId> externalIds = getNodesOfType(ASTDoctypeExternalId.class, nodes);
         assertEquals("One doctype external id expected!", 1, externalIds.size());
         ASTDoctypeExternalId externalId = externalIds.iterator().next();
         assertEquals("Correct external public id expected!", "-//W3C//DTD XHTML 1.1//EN", externalId.getPublicId());
@@ -131,7 +136,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testComment() {
-        List<ASTCommentTag> comments = jsp.getNodes(ASTCommentTag.class, TEST_COMMENT);
+        Set<ASTCommentTag> comments = getNodes(ASTCommentTag.class, TEST_COMMENT);
         assertEquals("One comment expected!", 1, comments.size());
         ASTCommentTag comment = comments.iterator().next();
         assertEquals("Correct comment content expected!", "comment", comment.getImage());
@@ -142,7 +147,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testHtmlScript() {
-        List<ASTHtmlScript> scripts = jsp.getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT);
+        Set<ASTHtmlScript> scripts = getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT);
         assertEquals("One script expected!", 1, scripts.size());
         ASTHtmlScript script = scripts.iterator().next();
         assertEquals("Correct script content expected!", "Script!", script.getImage());
@@ -154,7 +159,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testImportHtmlScript() {
-        List<ASTHtmlScript> scripts = jsp.getNodes(ASTHtmlScript.class, TEST_IMPORT_JAVASCRIPT);
+        Set<ASTHtmlScript> scripts = getNodes(ASTHtmlScript.class, TEST_IMPORT_JAVASCRIPT);
         assertEquals("One script expected!", 1, scripts.size());
         ASTHtmlScript script = scripts.iterator().next();
         List<ASTAttributeValue> value = script.findDescendantsOfType(ASTAttributeValue.class);
@@ -166,7 +171,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testHtmlScriptWithAttribute() {
-        List<ASTHtmlScript> scripts = jsp.getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT_WITH_ATTRIBUTE);
+        Set<ASTHtmlScript> scripts = getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT_WITH_ATTRIBUTE);
         assertEquals("One script expected!", 1, scripts.size());
         ASTHtmlScript script = scripts.iterator().next();
         assertEquals("Correct script content expected!", "Script!", script.getImage());
@@ -179,11 +184,11 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testComplexHtmlScript() {
-        List<ASTHtmlScript> script = jsp.getNodes(ASTHtmlScript.class, TEST_COMPLEX_SCRIPT);
+        Set<ASTHtmlScript> script = getNodes(ASTHtmlScript.class, TEST_COMPLEX_SCRIPT);
         assertEquals("One script expected!", 1, script.size());
         ASTHtmlScript next = script.iterator().next();
         assertTrue(next.getImage().contains("<!--"));
-        List<ASTCommentTag> comments = jsp.getNodes(ASTCommentTag.class, TEST_COMPLEX_SCRIPT);
+        Set<ASTCommentTag> comments = getNodes(ASTCommentTag.class, TEST_COMPLEX_SCRIPT);
         assertEquals("One comment expected!", 1, comments.size());
     }
 
@@ -192,7 +197,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testInlineCss() {
-        List<ASTElement> scripts = jsp.getNodes(ASTElement.class, TEST_INLINE_STYLE);
+        Set<ASTElement> scripts = getNodes(ASTElement.class, TEST_INLINE_STYLE);
         assertEquals("Three elements expected!", 3, scripts.size());
     }
 
@@ -201,7 +206,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testTextInTag() {
-        List<ASTText> scripts = jsp.getNodes(ASTText.class, TEST_TEXT_IN_TAG);
+        Set<ASTText> scripts = getNodes(ASTText.class, TEST_TEXT_IN_TAG);
         assertEquals("One text chunk expected!", 1, scripts.size());
         ASTText script = scripts.iterator().next();
         assertEquals("Correct content expected!", " some text ", script.getImage());
@@ -213,10 +218,14 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void noSpacesBetweenTags() {
-        List<ASTElement> elmts = jsp.getNodes(ASTElement.class, TEST_TAGS_NO_SPACE);
-        assertEquals("Two tags expected!", 2, elmts.size());
-        assertEquals("Correct content expected!", "a", elmts.get(0).getName());
-        assertEquals("Correct content expected!", "b", elmts.get(1).getName());
+        Set<ASTElement> scripts = getNodes(ASTElement.class, TEST_TAGS_NO_SPACE);
+        assertEquals("Two tags expected!", 2, scripts.size());
+        List<ASTElement> elmts = sortNodesByName(scripts);
+        Iterator<ASTElement> iterator = elmts.iterator();
+        ASTElement script = iterator.next();
+        assertEquals("Correct content expected!", "a", script.getName());
+        script = iterator.next();
+        assertEquals("Correct content expected!", "b", script.getName());
     }
 
     /**
@@ -225,7 +234,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void unclosedTagsWithDollar() {
-        List<ASTText> scripts = jsp.getNodes(ASTText.class, TEST_TAGS_WITH_DOLLAR);
+        Set<ASTText> scripts = getNodes(ASTText.class, TEST_TAGS_WITH_DOLLAR);
         assertEquals("Two text chunks expected!", 2, scripts.size());
         ASTText script = scripts.iterator().next();
         assertEquals("Correct content expected!", " $ ", script.getImage());
@@ -237,7 +246,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void unclosedTagsWithELWithin() {
-        List<ASTElExpression> scripts = jsp.getNodes(ASTElExpression.class, TEST_TAGS_WITH_EL_WITHIN);
+        Set<ASTElExpression> scripts = getNodes(ASTElExpression.class, TEST_TAGS_WITH_EL_WITHIN);
         assertEquals("Two EL expressions expected!", 2, scripts.size());
         List<ASTElExpression> exprs = sortByImage(scripts);
         Iterator<ASTElExpression> iterator = exprs.iterator();
@@ -252,14 +261,14 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void mixedExpressions() {
-        List<ASTJspExpression> exprs = jsp.getNodes(ASTJspExpression.class, TEST_TAGS_WITH_MIXED_EXPRESSIONS);
+        Set<ASTJspExpression> exprs = getNodes(ASTJspExpression.class, TEST_TAGS_WITH_MIXED_EXPRESSIONS);
         assertEquals("One JSP expression expected!", 1, exprs.size());
         assertEquals("Image of expression should be \"expr\"", "expr", exprs.iterator().next().getImage());
-        List<ASTElExpression> els = jsp.getNodes(ASTElExpression.class, TEST_TAGS_WITH_MIXED_EXPRESSIONS);
+        Set<ASTElExpression> els = getNodes(ASTElExpression.class, TEST_TAGS_WITH_MIXED_EXPRESSIONS);
         assertEquals("Two EL expression expected!", 2, els.size());
         assertEquals("Image of el should be \"expr\"", "expr", els.iterator().next().getImage());
 
-        List<ASTUnparsedText> unparsedtexts = jsp.getNodes(ASTUnparsedText.class, TEST_TAGS_WITH_MIXED_EXPRESSIONS);
+        Set<ASTUnparsedText> unparsedtexts = getNodes(ASTUnparsedText.class, TEST_TAGS_WITH_MIXED_EXPRESSIONS);
         List<ASTUnparsedText> sortedUnparsedTxts = sortByImage(unparsedtexts);
         assertEquals("Two unparsed texts expected!", 2, sortedUnparsedTxts.size());
         Iterator<ASTUnparsedText> iterator = sortedUnparsedTxts.iterator();
@@ -267,7 +276,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
         assertEquals("Image of text should be \" aaa \"", " aaa ", iterator.next().getImage());
 
         // ASTText should contain the text between two tags.
-        List<ASTText> texts = jsp.getNodes(ASTText.class, TEST_TAGS_WITH_MIXED_EXPRESSIONS);
+        Set<ASTText> texts = getNodes(ASTText.class, TEST_TAGS_WITH_MIXED_EXPRESSIONS);
         List<ASTText> sortedTxts = sortByImage(texts);
         assertEquals("Two regular texts expected!", 2, sortedTxts.size());
         Iterator<ASTText> iterator2 = sortedTxts.iterator();
@@ -282,7 +291,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void unclosedTagsWithJspExpressionWithin() {
-        List<ASTJspExpression> scripts = jsp.getNodes(ASTJspExpression.class, TEST_TAGS_WITH_EXPRESSION_WITHIN);
+        Set<ASTJspExpression> scripts = getNodes(ASTJspExpression.class, TEST_TAGS_WITH_EXPRESSION_WITHIN);
         assertEquals("Two JSP expressions expected!", 2, scripts.size());
         ASTJspExpression script = scripts.iterator().next();
         assertEquals("Correct content expected!", "expr", script.getImage());
@@ -296,7 +305,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
     @Ignore // sadly the number of
     // <opening> tags has to be >= then the number of </closing> tags
     public void textBetweenUnopenedTag() {
-        List<ASTText> scripts = jsp.getNodes(ASTText.class, TEST_TEXT_WITH_UNOPENED_TAG);
+        Set<ASTText> scripts = getNodes(ASTText.class, TEST_TEXT_WITH_UNOPENED_TAG);
         assertEquals("Two text chunks expected!", 2, scripts.size());
         ASTText script = scripts.iterator().next();
         assertEquals("Correct content expected!", "$", script.getImage());
@@ -310,7 +319,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
     @Ignore // sadly the number of
     // <opening> tags has to be >= then the number of </closing> tags
     public void textMultipleClosingTags() {
-        List<ASTText> scripts = jsp.getNodes(ASTText.class, TEST_MULTIPLE_CLOSING_TAGS);
+        Set<ASTText> scripts = getNodes(ASTText.class, TEST_MULTIPLE_CLOSING_TAGS);
         assertEquals("Four text chunks expected!", 4, scripts.size());
         ASTText script = scripts.iterator().next();
         assertEquals("Correct content expected!", " some text ", script.getImage());
@@ -321,20 +330,21 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void textAfterOpenAndClosedTag() {
-        List<ASTElement> nodes = jsp.getNodes(ASTElement.class, TEST_TEXT_AFTER_OPEN_AND_CLOSED_TAG);
+        Set<ASTElement> nodes = getNodes(ASTElement.class, TEST_TEXT_AFTER_OPEN_AND_CLOSED_TAG);
         assertEquals("Two elements expected!", 2, nodes.size());
-        assertEquals("First element should be a", "a", nodes.get(0).getName());
-        assertFalse("first element should be closed", nodes.get(0).isUnclosed());
-        assertEquals("Second element should be b", "b", nodes.get(1).getName());
-        assertTrue("Second element should not be closed", nodes.get(1).isUnclosed());
+        List<ASTElement> elmts = sortNodesByName(nodes);
+        assertEquals("First element should be a", "a", elmts.get(0).getName());
+        assertFalse("first element should be closed", elmts.get(0).isUnclosed());
+        assertEquals("Second element should be b", "b", elmts.get(1).getName());
+        assertTrue("Second element should not be closed", elmts.get(1).isUnclosed());
 
-        List<ASTText> text = jsp.getNodes(ASTText.class, TEST_TEXT_AFTER_OPEN_AND_CLOSED_TAG);
+        Set<ASTText> text = getNodes(ASTText.class, TEST_TEXT_AFTER_OPEN_AND_CLOSED_TAG);
         assertEquals("Two text chunks expected!", 2, text.size());
     }
 
     @Test
     public void quoteEL() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_QUOTE_EL);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_QUOTE_EL);
         assertEquals("One attribute expected!", 1, attributes.size());
         ASTAttributeValue attr = attributes.iterator().next();
         assertEquals("Expected to detect proper value for attribute!", "${something}", attr.getImage());
@@ -342,7 +352,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
 
     @Test
     public void quoteExpression() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_QUOTE_EXPRESSION);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_QUOTE_EXPRESSION);
         assertEquals("One attribute expected!", 1, attributes.size());
         ASTAttributeValue attr = attributes.iterator().next();
         assertEquals("Expected to detect proper value for attribute!", "<%=something%>", attr.getImage());
@@ -351,7 +361,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
     @Test
     @Ignore // tags contain quotes and break attribute parsing
     public void quoteTagInAttribute() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_QUOTE_TAG_IN_ATTR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_QUOTE_TAG_IN_ATTR);
         assertEquals("One attribute expected!", 1, attributes.size());
         ASTAttributeValue attr = attributes.iterator().next();
         assertEquals("Expected to detect proper value for attribute!", "<bean:write name=\"x\" property=\"z\">",
@@ -363,7 +373,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void noQuoteAttrValue() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR);
         assertEquals("One attribute expected!", 1, attributes.size());
         ASTAttributeValue attr = attributes.iterator().next();
         assertEquals("Expected to detect proper value for attribute!", "yes|", attr.getImage());
@@ -374,7 +384,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void noQuoteAttrWithJspEL() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_EL);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_EL);
         assertEquals("two attributes expected!", 2, attributes.size());
         Iterator<ASTAttributeValue> iterator = attributes.iterator();
         ASTAttributeValue attr2 = iterator.next();
@@ -392,7 +402,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void noQuoteAttrWithJspExpression() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_EXPRESSION);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_EXPRESSION);
         assertEquals("One attribute expected!", 1, attributes.size());
         ASTAttributeValue attr = attributes.iterator().next();
         assertEquals("Expected to detect proper value for attribute!", "<%=something%>", attr.getImage());
@@ -403,7 +413,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void noQuoteAttrEmpty() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_EMPTY_ATTR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_EMPTY_ATTR);
         assertEquals("two attributes expected!", 2, attributes.size());
         Iterator<ASTAttributeValue> iterator = attributes.iterator();
         ASTAttributeValue attr = iterator.next();
@@ -420,7 +430,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void noQuoteAttrCrLf() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_CR_LF_ATTR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_CR_LF_ATTR);
         assertEquals("One attribute expected!", 2, attributes.size());
         Iterator<ASTAttributeValue> iterator = attributes.iterator();
         ASTAttributeValue attr = iterator.next();
@@ -438,7 +448,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void noQuoteAttrTab() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_TAB_ATTR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_TAB_ATTR);
         assertEquals("One attribute expected!", 1, attributes.size());
         Iterator<ASTAttributeValue> iterator = attributes.iterator();
         ASTAttributeValue attr = iterator.next();
@@ -452,7 +462,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void noQuoteAttrWithMalformedJspExpression() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_MALFORMED_EXPR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_MALFORMED_EXPR);
         assertEquals("One attribute expected!", 1, attributes.size());
         ASTAttributeValue attr = attributes.iterator().next();
         assertEquals("Expected to detect proper value for attribute!", "<%=something", attr.getImage());
@@ -465,7 +475,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
     @Test
     @Ignore // nice test for future development
     public void noQuoteAttrWithScriptletInValue() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_SCRIPTLET);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_SCRIPTLET);
         assertEquals("One attribute expected!", 1, attributes.size());
 
         ASTAttributeValue attr = attributes.iterator().next();
@@ -475,12 +485,12 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
     /**
      * test a no quote attribute value can contain a tag (e.g.
      * attr=&lt;bean:write property="value" /&gt;)
-     *
+     * 
      */
     @Test
     @Ignore // nice test for future development
     public void noQuoteAttrWithBeanWriteTagAsValue() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_TAG_IN_ATTR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_TAG_IN_ATTR);
         assertEquals("One attribute expected!", 1, attributes.size());
 
         ASTAttributeValue attr = attributes.iterator().next();
@@ -495,7 +505,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
     @Test
     @Ignore // nice test for future development
     public void quoteAttrWithBeanWriteTagAsValue() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_TAG_IN_ATTR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_TAG_IN_ATTR);
         assertEquals("One attribute expected!", 1, attributes.size());
 
         ASTAttributeValue attr = attributes.iterator().next();
@@ -509,7 +519,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
     @Test
     @Ignore // nice test for future development
     public void noQuoteAttrWithDollarSignInValue() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_DOLLAR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_DOLLAR);
         assertEquals("One attribute expected!", 2, attributes.size());
         ASTAttributeValue attr = attributes.iterator().next();
         assertEquals("Expected to detect proper value for attribute!", "${something", attr.getImage());
@@ -522,7 +532,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
     @Test
     @Ignore // nice test for future development
     public void noQuoteAttrWithSharpSymbolInValue() {
-        List<ASTAttributeValue> attributes = jsp.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_HASH);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_HASH);
         assertEquals("One attribute expected!", 1, attributes.size());
         ASTAttributeValue attr = attributes.iterator().next();
         assertEquals("Expected to detect proper value for attribute!", "#{something", attr.getImage());
@@ -530,20 +540,21 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
 
     @Test
     public void unclosedTag() {
-        List<ASTElement> elements = jsp.getNodes(ASTElement.class, TEST_UNCLOSED_SIMPLE);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_SIMPLE);
+        List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("2 tags expected", 2, elements.size());
-        assertEquals("First element should be tag:someTag", "tag:someTag", elements.get(0).getName());
-        assertEquals("Second element should be sorted tag:if", "tag:if", elements.get(1).getName());
+        assertEquals("First element should be sorted tag:if", "tag:if", sortedElmnts.get(0).getName());
+        assertEquals("Second element should be tag:someTag", "tag:someTag", sortedElmnts.get(1).getName());
 
-        assertFalse(elements.get(0).isEmpty());
-        assertFalse(elements.get(0).isUnclosed());
-        assertTrue(elements.get(1).isEmpty());
-        assertTrue(elements.get(1).isUnclosed());
+        assertTrue(sortedElmnts.get(0).isEmpty());
+        assertTrue(sortedElmnts.get(0).isUnclosed());
+        assertFalse(sortedElmnts.get(1).isEmpty());
+        assertFalse(sortedElmnts.get(1).isUnclosed());
     }
 
     @Test
     public void unclosedTagAndNoQuotesForAttribute() {
-        List<ASTElement> elements = jsp.getNodes(ASTElement.class, TEST_UNCLOSED_NO_QUOTE_ATTR);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_NO_QUOTE_ATTR);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("2 tags expected", 2, elements.size());
         assertEquals("First element should be sorted tag:if", "tag:if", sortedElmnts.get(0).getName());
@@ -557,7 +568,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
 
     @Test
     public void unclosedTagMultipleLevels() {
-        List<ASTElement> elements = jsp.getNodes(ASTElement.class, TEST_UNCLOSED_MULTIPLE_LEVELS);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_MULTIPLE_LEVELS);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("3 tags expected", 3, elements.size());
         assertEquals("First element should be sorted tag:someTag", "tag:someTag", sortedElmnts.get(0).getName());
@@ -579,7 +590,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void nestedEmptyTags() {
-        List<ASTElement> elements = jsp.getNodes(ASTElement.class, TEST_MULTIPLE_EMPTY_TAGS);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_MULTIPLE_EMPTY_TAGS);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("4 tags expected", 4, elements.size());
         assertEquals("First element should a1", "a1", sortedElmnts.get(0).getName());
@@ -610,7 +621,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void nestedMultipleTags() {
-        List<ASTElement> elements = jsp.getNodes(ASTElement.class, TEST_MULTIPLE_NESTED_TAGS);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_MULTIPLE_NESTED_TAGS);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("4 tags expected", 6, elements.size());
         assertEquals("First element should a1", "a1", sortedElmnts.get(0).getName());
@@ -647,13 +658,13 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
     }
 
     /**
-     * will test &lt;x&gt; &lt;a&gt; &lt;b&gt; &lt;b&gt; &lt;/x&gt; &lt;/a&gt; &lt;/x&gt; .
+     * will test &lt;x&gt; &lt;a&gt; &lt;b&gt; &lt;b&gt; &lt;/x&gt; &lt;/a&gt; &lt;/x&gt; . 
      * Here x is the first tag to be closed thus rendering the next close of a (&lt;/a&gt;)
-     * to be disregarded.
+     * to be disregarded. 
      */
     @Test
     public void unclosedParentTagClosedBeforeChild() {
-        List<ASTElement> elements = jsp.getNodes(ASTElement.class, TEST_UNCLOSED_END_AFTER_PARENT_CLOSE);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_END_AFTER_PARENT_CLOSE);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("4 tags expected", 4, elements.size());
         assertEquals("First element should be 'a'", "a", sortedElmnts.get(0).getName());
@@ -686,7 +697,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void unmatchedTagDoesNotInfluenceStructure() {
-        List<ASTElement> elements = jsp.getNodes(ASTElement.class, TEST_UNCLOSED_UNMATCHED_CLOSING_TAG);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_UNMATCHED_CLOSING_TAG);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("4 tags expected", 4, elements.size());
         assertEquals("First element should be 'a'", "a", sortedElmnts.get(0).getName());
@@ -719,7 +730,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void unclosedStartTagWithUnmatchedCloseOfDifferentTag() {
-        List<ASTElement> elements = jsp.getNodes(ASTElement.class, TEST_UNCLOSED_START_TAG_WITH_UNMATCHED_CLOSE);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_START_TAG_WITH_UNMATCHED_CLOSE);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("5 tags expected", 5, elements.size());
         assertEquals("First element should be 'a'", "a", sortedElmnts.get(0).getName());
@@ -751,7 +762,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
 
     /**
      * {@link #TEST_UNCLOSED_END_OF_DOC}
-     * &lt;tag:x&gt; &lt;tag:y&gt;
+     * &lt;tag:x&gt; &lt;tag:y&gt; 
      * Tests whether parser breaks on no closed tags at all
      */
     // This is yet to be improved. If a closing tag does not
@@ -759,7 +770,7 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
     @Ignore
     @Test
     public void unclosedEndOfDoc() {
-        List<ASTElement> elements = jsp.getNodes(ASTElement.class, TEST_UNCLOSED_END_OF_DOC);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_END_OF_DOC);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("2 tags expected", 2, elements.size());
         assertEquals("First element should be 'tag:x'", "tag:x", sortedElmnts.get(0).getName());
@@ -779,11 +790,11 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
      * is the same it will sort against o1.getBeginColumn() +""+
      * o1.getBeginLine(). so first criteria is the name, then the second is the
      * column +""+line string.
-     *
+     * 
      * @param elements
      * @return
      */
-    private List<ASTElement> sortNodesByName(Collection<ASTElement> elements) {
+    private List<ASTElement> sortNodesByName(Set<ASTElement> elements) {
         List<ASTElement> list = new ArrayList<>();
         list.addAll(elements);
         Collections.sort(list, new Comparator<ASTElement>() {
@@ -807,11 +818,11 @@ public class JspDocStyleTest extends AbstractJspNodesTst {
 
     /**
      * will sort the AST node by the image name.
-     *
+     * 
      * @param elements
      * @return
      */
-    private <T extends Node> List<T> sortByImage(Collection<T> elements) {
+    private <T extends Node> List<T> sortByImage(Set<T> elements) {
         List<T> list = new ArrayList<>();
         list.addAll(elements);
         Collections.sort(list, new Comparator<Node>() {
diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspPageStyleTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspPageStyleTest.java
index b31dd16676..47b12f1d70 100644
--- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspPageStyleTest.java
+++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspPageStyleTest.java
@@ -6,7 +6,11 @@ package net.sourceforge.pmd.lang.jsp.ast;
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.Test;
 
@@ -17,7 +21,7 @@ public class JspPageStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testComment() {
-        List<ASTJspComment> comments = jsp.getNodes(ASTJspComment.class, JSP_COMMENT);
+        Set<ASTJspComment> comments = getNodes(ASTJspComment.class, JSP_COMMENT);
         assertEquals("One comment expected!", 1, comments.size());
         ASTJspComment comment = comments.iterator().next();
         assertEquals("Correct comment content expected!", "some comment", comment.getImage());
@@ -28,21 +32,28 @@ public class JspPageStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testDirective() {
-        ASTCompilationUnit root = jsp.parse(JSP_DIRECTIVE);
+        Set<JspNode> nodes = getNodes(null, JSP_DIRECTIVE);
 
-        List<ASTJspDirective> directives = root.findDescendantsOfType(ASTJspDirective.class);
+        Set<ASTJspDirective> directives = getNodesOfType(ASTJspDirective.class, nodes);
         assertEquals("One directive expected!", 1, directives.size());
         ASTJspDirective directive = directives.iterator().next();
         assertEquals("Correct directive name expected!", "page", directive.getName());
 
-        List<ASTJspDirectiveAttribute> directiveAttrs = root.findDescendantsOfType(ASTJspDirectiveAttribute.class);
+        Set<ASTJspDirectiveAttribute> directiveAttrs = getNodesOfType(ASTJspDirectiveAttribute.class, nodes);
         assertEquals("Two directive attributes expected!", 2, directiveAttrs.size());
 
-        ASTJspDirectiveAttribute attr = directiveAttrs.get(0);
+        List<ASTJspDirectiveAttribute> attrsList = new ArrayList<>(directiveAttrs);
+        Collections.sort(attrsList, new Comparator<ASTJspDirectiveAttribute>() {
+            public int compare(ASTJspDirectiveAttribute arg0, ASTJspDirectiveAttribute arg1) {
+                return arg0.getName().compareTo(arg1.getName());
+            }
+        });
+
+        ASTJspDirectiveAttribute attr = attrsList.get(0);
         assertEquals("Correct directive attribute name expected!", "language", attr.getName());
         assertEquals("Correct directive attribute value expected!", "java", attr.getValue());
 
-        attr = directiveAttrs.get(1);
+        attr = attrsList.get(1);
         assertEquals("Correct directive attribute name expected!", "session", attr.getName());
         assertEquals("Correct directive attribute value expected!", "true", attr.getValue());
 
@@ -53,7 +64,7 @@ public class JspPageStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testDeclaration() {
-        List<ASTJspDeclaration> declarations = jsp.getNodes(ASTJspDeclaration.class, JSP_DECLARATION);
+        Set<ASTJspDeclaration> declarations = getNodes(ASTJspDeclaration.class, JSP_DECLARATION);
         assertEquals("One declaration expected!", 1, declarations.size());
         ASTJspDeclaration declaration = declarations.iterator().next();
         assertEquals("Correct declaration content expected!", "String someString = \"s\";", declaration.getImage());
@@ -64,7 +75,7 @@ public class JspPageStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testScriptlet() {
-        List<ASTJspScriptlet> scriptlets = jsp.getNodes(ASTJspScriptlet.class, JSP_SCRIPTLET);
+        Set<ASTJspScriptlet> scriptlets = getNodes(ASTJspScriptlet.class, JSP_SCRIPTLET);
         assertEquals("One scriptlet expected!", 1, scriptlets.size());
         ASTJspScriptlet scriptlet = scriptlets.iterator().next();
         assertEquals("Correct scriptlet content expected!", "someString = someString + \"suffix\";",
@@ -76,7 +87,7 @@ public class JspPageStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testExpression() {
-        List<ASTJspExpression> expressions = jsp.getNodes(ASTJspExpression.class, JSP_EXPRESSION);
+        Set<ASTJspExpression> expressions = getNodes(ASTJspExpression.class, JSP_EXPRESSION);
         assertEquals("One expression expected!", 1, expressions.size());
         ASTJspExpression expression = expressions.iterator().next();
         assertEquals("Correct expression content expected!", "someString", expression.getImage());
@@ -87,7 +98,8 @@ public class JspPageStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testExpressionInAttribute() {
-        List<ASTJspExpressionInAttribute> expressions = jsp.getNodes(ASTJspExpressionInAttribute.class, JSP_EXPRESSION_IN_ATTRIBUTE);
+        Set<ASTJspExpressionInAttribute> expressions = getNodes(ASTJspExpressionInAttribute.class,
+                JSP_EXPRESSION_IN_ATTRIBUTE);
         assertEquals("One expression expected!", 1, expressions.size());
         ASTJspExpressionInAttribute expression = expressions.iterator().next();
         assertEquals("Correct expression content expected!", "style.getClass()", expression.getImage());
@@ -98,7 +110,7 @@ public class JspPageStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testElExpression() {
-        List<ASTElExpression> expressions = jsp.getNodes(ASTElExpression.class, JSP_EL_EXPRESSION);
+        Set<ASTElExpression> expressions = getNodes(ASTElExpression.class, JSP_EL_EXPRESSION);
         assertEquals("One expression expected!", 1, expressions.size());
         ASTElExpression expression = expressions.iterator().next();
         assertEquals("Correct expression content expected!", "myBean.get(\"${ World }\")", expression.getImage());
@@ -109,7 +121,7 @@ public class JspPageStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testElExpressionInAttribute() {
-        List<ASTElExpression> expressions = jsp.getNodes(ASTElExpression.class, JSP_EL_EXPRESSION_IN_ATTRIBUTE);
+        Set<ASTElExpression> expressions = getNodes(ASTElExpression.class, JSP_EL_EXPRESSION_IN_ATTRIBUTE);
         assertEquals("One expression expected!", 1, expressions.size());
         ASTElExpression expression = expressions.iterator().next();
         assertEquals("Correct expression content expected!", "myValidator.find(\"'jsp'\")", expression.getImage());
@@ -120,7 +132,7 @@ public class JspPageStyleTest extends AbstractJspNodesTst {
      */
     @Test
     public void testJsfValueBinding() {
-        List<ASTValueBinding> valueBindings = jsp.getNodes(ASTValueBinding.class, JSF_VALUE_BINDING);
+        Set<ASTValueBinding> valueBindings = getNodes(ASTValueBinding.class, JSF_VALUE_BINDING);
         assertEquals("One value binding expected!", 1, valueBindings.size());
         ASTValueBinding valueBinding = valueBindings.iterator().next();
         assertEquals("Correct expression content expected!", "myValidator.find(\"'jsf'\")", valueBinding.getImage());
diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspParsingHelper.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspParsingHelper.java
deleted file mode 100644
index 2b7d153f06..0000000000
--- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspParsingHelper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.jsp.ast;
-
-import org.jetbrains.annotations.NotNull;
-
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
-import net.sourceforge.pmd.lang.jsp.JspLanguageModule;
-
-public final class JspParsingHelper extends BaseParsingHelper<JspParsingHelper, ASTCompilationUnit> {
-
-    public static final JspParsingHelper DEFAULT = new JspParsingHelper(Params.getDefaultProcess());
-
-    private JspParsingHelper(@NotNull Params params) {
-        super(JspLanguageModule.NAME, ASTCompilationUnit.class, params);
-    }
-
-    @NotNull
-    @Override
-    protected JspParsingHelper clone(@NotNull Params params) {
-        return new JspParsingHelper(params);
-    }
-}
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index bc2c634a85..7930e4e27d 100644
--- a/pmd-plsql/pom.xml
+++ b/pmd-plsql/pom.xml
@@ -101,20 +101,10 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-lang-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/AbstractPLSQLParserTst.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/AbstractPLSQLParserTst.java
index 9d49470e56..8923f43683 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/AbstractPLSQLParserTst.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/AbstractPLSQLParserTst.java
@@ -4,8 +4,139 @@
 
 package net.sourceforge.pmd.lang.plsql;
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.io.IOUtils;
+
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.lang.LanguageVersionHandler;
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.plsql.ast.ASTInput;
+import net.sourceforge.pmd.lang.plsql.ast.PLSQLParserVisitor;
+import net.sourceforge.pmd.lang.plsql.dfa.DataFlowFacade;
+import net.sourceforge.pmd.lang.plsql.symboltable.SymbolFacade;
+
 public abstract class AbstractPLSQLParserTst {
 
-    protected final PlsqlParsingHelper plsql = PlsqlParsingHelper.WITH_PROCESSING.withResourceContext(getClass());
+    private class Collector<E> implements InvocationHandler {
+        private Class<E> clazz = null;
+        private Collection<E> collection;
 
+        Collector(Class<E> clazz) {
+            this(clazz, new HashSet<E>());
+        }
+
+        Collector(Class<E> clazz, Collection<E> coll) {
+            this.clazz = clazz;
+            this.collection = coll;
+        }
+
+        public Collection<E> getCollection() {
+            return collection;
+        }
+
+        public Object invoke(Object proxy, Method method, Object[] params) throws NoSuchMethodException,
+                SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+            if (method.getName().equals("visit")) {
+                if (clazz.isInstance(params[0])) {
+                    collection.add((E) params[0]);
+                }
+            }
+
+            Method childrenAccept = params[0].getClass().getMethod("childrenAccept",
+                    new Class[] { PLSQLParserVisitor.class, Object.class });
+            childrenAccept.invoke(params[0], new Object[] { proxy, null });
+            return null;
+        }
+    }
+
+    public <E> Set<E> getNodes(Class<E> clazz, String plsqlCode) {
+        return getNodes(LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME).getDefaultVersion(), clazz, plsqlCode);
+    }
+
+    public <E> Set<E> getNodes(LanguageVersion languageVersion, Class<E> clazz, String plsqlCode) {
+        Collector<E> coll = new Collector<>(clazz);
+        LanguageVersionHandler languageVersionHandler = languageVersion.getLanguageVersionHandler();
+        ASTInput cu = (ASTInput) languageVersionHandler.getParser(languageVersionHandler.getDefaultParserOptions())
+                .parse(null, new StringReader(plsqlCode));
+        PLSQLParserVisitor jpv = (PLSQLParserVisitor) Proxy.newProxyInstance(PLSQLParserVisitor.class.getClassLoader(),
+                new Class[] { PLSQLParserVisitor.class }, coll);
+        jpv.visit(cu, null);
+        return (Set<E>) coll.getCollection();
+    }
+
+    public <E> List<E> getOrderedNodes(Class<E> clazz, String plsqlCode) {
+        Collector<E> coll = new Collector<>(clazz, new ArrayList<E>());
+        LanguageVersionHandler languageVersionHandler = LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
+        ASTInput cu = (ASTInput) languageVersionHandler.getParser(languageVersionHandler.getDefaultParserOptions())
+                .parse(null, new StringReader(plsqlCode));
+        PLSQLParserVisitor jpv = (PLSQLParserVisitor) Proxy.newProxyInstance(PLSQLParserVisitor.class.getClassLoader(),
+                new Class[] { PLSQLParserVisitor.class }, coll);
+        jpv.visit(cu, null);
+        SymbolFacade sf = new SymbolFacade();
+        sf.initializeWith(cu);
+        DataFlowFacade dff = new DataFlowFacade();
+        dff.initializeWith(languageVersionHandler.getDataFlowHandler(), cu);
+        return (List<E>) coll.getCollection();
+    }
+
+    public <E> String dumpNodes(List<E> list) {
+        StringBuilder sb = new StringBuilder();
+        int index = 0;
+        for (E item : list) {
+            sb.append("\n node[").append(index).append(item.toString());
+            index++;
+        }
+        return sb.toString();
+    }
+
+    public ASTInput buildDFA(String plsqlCode) {
+        LanguageVersionHandler languageVersionHandler = LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
+        ASTInput cu = (ASTInput) languageVersionHandler.getParser(languageVersionHandler.getDefaultParserOptions())
+                .parse(null, new StringReader(plsqlCode));
+        PLSQLParserVisitor jpv = (PLSQLParserVisitor) Proxy.newProxyInstance(PLSQLParserVisitor.class.getClassLoader(),
+                new Class[] { PLSQLParserVisitor.class }, new Collector<>(ASTInput.class));
+        jpv.visit(cu, null);
+        new SymbolFacade().initializeWith(cu);
+        new DataFlowFacade().initializeWith(languageVersionHandler.getDataFlowHandler(), cu);
+        return cu;
+    }
+
+    public ASTInput parsePLSQL(LanguageVersion languageVersion, String code) {
+        LanguageVersionHandler languageVersionHandler = languageVersion.getLanguageVersionHandler();
+        return (ASTInput) languageVersionHandler.getParser(languageVersionHandler.getDefaultParserOptions()).parse(null,
+                new StringReader(code));
+    }
+
+    public ASTInput parsePLSQL(String code) {
+        return parsePLSQL(LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME).getDefaultVersion(), code);
+    }
+
+    public Node parseLanguage(LanguageVersion languageVersion, String code) {
+        LanguageVersionHandler languageVersionHandler = languageVersion.getLanguageVersionHandler();
+        return languageVersionHandler.getParser(languageVersionHandler.getDefaultParserOptions()).parse(null,
+                new StringReader(code));
+    }
+
+    public String loadTestResource(String name) {
+        try {
+            return IOUtils.toString(this.getClass().getResourceAsStream(name), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLParserTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLParserTest.java
new file mode 100644
index 0000000000..afa641c06c
--- /dev/null
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLParserTest.java
@@ -0,0 +1,77 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.plsql;
+
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+
+public class PLSQLParserTest extends AbstractPLSQLParserTst {
+
+    @Test
+    public void testExceptions() {
+        parsePLSQL("CREATE OR REPLACE PROCEDURE bar IS BEGIN" + "    doSomething;" + "    EXCEPTION"
+                + "    WHEN FooException THEN" + "        doSomethingElse;" + "    WHEN OTHERS THEN"
+                + "        doSomethingElse;" + "END;");
+    }
+
+    /**
+     * See https://sourceforge.net/p/pmd/bugs/1167/
+     */
+    @Test
+    public void testBOM() {
+        parsePLSQL("\ufeff" + "CREATE OR REPLACE PROCEDURE bar IS BEGIN" + "    doSomething;" + "    EXCEPTION"
+                + "    WHEN FooException THEN" + "        doSomethingElse;" + "    WHEN OTHERS THEN"
+                + "        doSomethingElse;" + "END;");
+    }
+
+    @Test(timeout = 5000)
+    public void testBug1531() {
+        parsePLSQL("create or replace force view oxa.o_xa_function_role_types as\n"
+                + "select \"CFT_ID\",\"CFR_ID\",\"CFT_NAME\",\"TCN\",\"LOG_MODULE\",\"LOG_USER\",\"LOG_DATE\",\"LOG_TIME\" from crm_function_role_types\n"
+                + "/");
+    }
+
+    @Test
+    public void testBug1527() throws Exception {
+        parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/InlinePragmaProcError.pls"), StandardCharsets.UTF_8));
+    }
+
+    @Test
+    public void testBug1520IsOfType() throws Exception {
+        parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/IsOfType.pls"), StandardCharsets.UTF_8));
+    }
+
+    @Test
+    public void testBug1520Using() throws Exception {
+        parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/Using.pls"), StandardCharsets.UTF_8));
+    }
+
+    @Test
+    public void testSingleLineSelect() throws Exception {
+        parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/SingleLineSelect.pls"), StandardCharsets.UTF_8));
+    }
+
+    @Test
+    public void testMultiLineSelect() throws Exception {
+        parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/MultiLineSelect.pls"), StandardCharsets.UTF_8));
+    }
+
+    @Test
+    public void testIsNull() throws Exception {
+        parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/IsNull.pls"), StandardCharsets.UTF_8));
+    }
+
+    @Test
+    public void testCodingStyleExample() throws Exception {
+        parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/CodingStyleExample.pls"), StandardCharsets.UTF_8));
+    }
+
+    @Test
+    public void testCaseIssue1454() throws Exception {
+        parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/CaseIssue1454.pls"), StandardCharsets.UTF_8));
+    }
+}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java
index 094edb08f4..fe3340396e 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLXPathRuleTest.java
@@ -7,6 +7,7 @@ package net.sourceforge.pmd.lang.plsql;
 import java.util.Arrays;
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 import net.sourceforge.pmd.RuleContext;
@@ -19,15 +20,16 @@ import net.sourceforge.pmd.lang.rule.XPathRule;
  */
 public class PLSQLXPathRuleTest extends AbstractPLSQLParserTst {
 
-    private ASTInput node = plsql.parse(
-        "create or replace\n" + "package pkg_xpath_problem\n" + "AS\n" + "    PROCEDURE pkg_minimal\n" + "    IS\n"
-            + "        a_variable VARCHAR2(1);\n" + "    BEGIN \n" + "        --PRAGMA INLINE(output,'YES');\n"
-            + "        a_variable := 'Y' ;\n" + "    END ;\n" + "end pkg_xpath_problem;\n" + "/\n" + "");
+    private ASTInput node = parsePLSQL(
+            "create or replace\n" + "package pkg_xpath_problem\n" + "AS\n" + "    PROCEDURE pkg_minimal\n" + "    IS\n"
+                    + "        a_variable VARCHAR2(1);\n" + "    BEGIN \n" + "        --PRAGMA INLINE(output,'YES');\n"
+                    + "        a_variable := 'Y' ;\n" + "    END ;\n" + "end pkg_xpath_problem;\n" + "/\n" + "");
 
     private RuleContext ctx = new RuleContext();
 
-    public PLSQLXPathRuleTest() {
-        ctx.setLanguageVersion(plsql.getDefaultVersion());
+    @Before
+    public void setup() {
+        ctx.setLanguageVersion(LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME).getDefaultVersion());
     }
 
     /**
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PlsqlParsingHelper.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PlsqlParsingHelper.java
deleted file mode 100644
index 0334bc9891..0000000000
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PlsqlParsingHelper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.plsql;
-
-import org.jetbrains.annotations.NotNull;
-
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
-import net.sourceforge.pmd.lang.plsql.ast.ASTInput;
-
-public class PlsqlParsingHelper extends BaseParsingHelper<PlsqlParsingHelper, ASTInput> {
-
-    /** This just runs the parser and no processing stages. */
-    public static final PlsqlParsingHelper JUST_PARSE = new PlsqlParsingHelper(Params.getDefaultNoProcess());
-    /** This runs all processing stages when parsing. */
-    public static final PlsqlParsingHelper WITH_PROCESSING = new PlsqlParsingHelper(Params.getDefaultProcess());
-
-    private PlsqlParsingHelper(Params params) {
-        super(PLSQLLanguageModule.NAME, ASTInput.class, params);
-    }
-
-    @NotNull
-    @Override
-    protected PlsqlParsingHelper clone(@NotNull Params params) {
-        return new PlsqlParsingHelper(params);
-    }
-
-}
-
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTComparisonConditionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTComparisonConditionTest.java
index 1425941012..52b2681581 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTComparisonConditionTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTComparisonConditionTest.java
@@ -15,7 +15,7 @@ public class ASTComparisonConditionTest extends AbstractPLSQLParserTst {
 
     @Test
     public void testOperator() {
-        ASTInput input = plsql.parse("BEGIN SELECT COUNT(1) INTO MY_TABLE FROM USERS_TABLE WHERE user_id = 1; END;");
+        ASTInput input = parsePLSQL("BEGIN SELECT COUNT(1) INTO MY_TABLE FROM USERS_TABLE WHERE user_id = 1; END;");
         List<ASTComparisonCondition> conditions = input.findDescendantsOfType(ASTComparisonCondition.class);
         Assert.assertEquals(1, conditions.size());
         Assert.assertEquals("=", conditions.get(0).getOperator());
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTCompoundConditionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTCompoundConditionTest.java
index ff13a04493..2dd3a52456 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTCompoundConditionTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ASTCompoundConditionTest.java
@@ -16,7 +16,7 @@ public class ASTCompoundConditionTest extends AbstractPLSQLParserTst {
 
     @Test
     public void testParseType() {
-        ASTInput input = plsql.parse("BEGIN SELECT COUNT(1) INTO MY_TABLE FROM USERS_TABLE WHERE user_id = 1 AnD user_id = 2; END;");
+        ASTInput input = parsePLSQL("BEGIN SELECT COUNT(1) INTO MY_TABLE FROM USERS_TABLE WHERE user_id = 1 AnD user_id = 2; END;");
         List<ASTCompoundCondition> compoundConditions = input.findDescendantsOfType(ASTCompoundCondition.class);
         Assert.assertFalse(compoundConditions.isEmpty());
         Assert.assertEquals("AND", compoundConditions.get(0).getType());
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AnonymousBlockTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AnonymousBlockTest.java
index bd5c9f1c60..6c2d74afa2 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AnonymousBlockTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AnonymousBlockTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,12 +15,18 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class AnonymousBlockTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseCursorInsideProcAnonymousBlock() {
-        plsql.parseResource("AnonymousBlock1.sql");
+    public void parseCursorInsideProcAnonymousBlock() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("AnonymousBlock1.sql"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
     @Test
-    public void parseCursorInsideAnonymousBlock() {
-        plsql.parseResource("AnonymousBlock2.sql");
+    public void parseCursorInsideAnonymousBlock() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("AnonymousBlock2.sql"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CreateTableTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CreateTableTest.java
index 01c1fa0fd3..0052faf081 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CreateTableTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CreateTableTest.java
@@ -4,6 +4,9 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -12,8 +15,11 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class CreateTableTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseCreateTable() {
-        ASTInput input = plsql.parseResource("CreateTable.pls");
+    public void parseCreateTable() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("CreateTable.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
 
         // 5th column of first table statement has a inline constraint of type check
         ASTTableColumn columnStatus = input.findChildrenOfType(ASTTable.class).get(0).findChildrenOfType(ASTTableColumn.class).get(4);
@@ -22,7 +28,10 @@ public class CreateTableTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void parseCreateOrganizedTable() {
-        plsql.parseResource("CreateOrganizedTable.pls");
+    public void parseCreateOrganizedTable() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("CreateOrganizedTable.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorAttributesTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorAttributesTest.java
index 429d47b83e..a7e232484b 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorAttributesTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorAttributesTest.java
@@ -13,14 +13,17 @@ public class CursorAttributesTest extends AbstractPLSQLParserTst {
 
     @Test
     public void parseCursorWithAttribute() {
-        ASTInput input = plsql.parseResource("CursorAttributes.pls");
+        String code = loadTestResource("CursorAttributes.pls");
+        ASTInput input = parsePLSQL(code);
         ASTExpression exp = input.getFirstDescendantOfType(ASTIfStatement.class).getFirstChildOfType(ASTExpression.class);
         Assert.assertEquals("TestSearch%notfound", exp.getImage());
     }
 
     @Test
     public void parseImplicitCursorAttributeBulkExceptions() {
-        plsql.parseResource("CursorAttributesBulkExceptions.pls");
+        String code = loadTestResource("CursorAttributesBulkExceptions.pls");
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
index 6b8b99e369..e3d0a77fc5 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
@@ -13,7 +13,8 @@ public class CursorForLoopTest extends AbstractPLSQLParserTst {
 
     @Test
     public void parseCursorForLoopSimple() {
-        ASTInput input = plsql.parseResource("CursorForLoopSimple.pls");
+        String code = loadTestResource("CursorForLoopSimple.pls");
+        ASTInput input = parsePLSQL(code);
         ASTCursorForLoopStatement forloop = input.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
         Assert.assertNotNull(forloop);
         ASTForIndex forindex = forloop.getFirstChildOfType(ASTForIndex.class);
@@ -23,7 +24,8 @@ public class CursorForLoopTest extends AbstractPLSQLParserTst {
 
     @Test
     public void parseCursorForLoopNested() {
-        ASTInput input = plsql.parseResource("CursorForLoopNested.pls");
+        String code = loadTestResource("CursorForLoopNested.pls");
+        ASTInput input = parsePLSQL(code);
         ASTCursorForLoopStatement forloop = input.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
         Assert.assertNotNull(forloop);
         ASTForIndex forindex = forloop.getFirstChildOfType(ASTForIndex.class);
@@ -41,19 +43,22 @@ public class CursorForLoopTest extends AbstractPLSQLParserTst {
 
     @Test
     public void parseCursorForLoop1047a() {
-        ASTInput input = plsql.parseResource("CursorForLoop1047a.pls");
+        String code = loadTestResource("CursorForLoop1047a.pls");
+        ASTInput input = parsePLSQL(code);
         Assert.assertNotNull(input);
     }
 
     @Test
     public void parseCursorForLoop1047b() {
-        ASTInput input = plsql.parseResource("CursorForLoop1047b.pls");
+        String code = loadTestResource("CursorForLoop1047b.pls");
+        ASTInput input = parsePLSQL(code);
         Assert.assertNotNull(input);
     }
 
     @Test
     public void parseCursorForLoop681() {
-        ASTInput input = plsql.parseResource("CursorForLoop681.pls");
+        String code = loadTestResource("CursorForLoop681.pls");
+        ASTInput input = parsePLSQL(code);
         Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorWithWithTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorWithWithTest.java
index bf0d285e6e..cfbb601150 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorWithWithTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorWithWithTest.java
@@ -4,6 +4,9 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -12,8 +15,11 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class CursorWithWithTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseCursorWithWith() {
-        ASTInput input = plsql.parseResource("CursorWithWith.pls");
+    public void parseCursorWithWith() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("CursorWithWith.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
         ASTCursorUnit cursor = input.getFirstDescendantOfType(ASTCursorUnit.class);
         ASTSelectStatement select = (ASTSelectStatement) cursor.jjtGetChild(1);
         ASTWithClause with = (ASTWithClause) select.jjtGetChild(0);
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/DeleteStatementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/DeleteStatementTest.java
index e0f1edd28f..fa2196466b 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/DeleteStatementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/DeleteStatementTest.java
@@ -4,8 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -14,12 +16,14 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class DeleteStatementTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseDeleteStatementExample() {
-        ASTInput input = plsql.parseResource("DeleteStatementExample.pls");
+    public void parseDeleteStatementExample() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("DeleteStatementExample.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTDeleteStatement> deleteStatements = input.findDescendantsOfType(ASTDeleteStatement.class);
         Assert.assertEquals(3, deleteStatements.size());
 
         Assert.assertEquals("product_descriptions", deleteStatements.get(0).jjtGetChild(0)
-                                                                    .getFirstChildOfType(ASTTableName.class).getImage());
+                .getFirstChildOfType(ASTTableName.class).getImage());
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateTest.java
index 0e459ec1b2..ff12b5d148 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,12 +15,18 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class ExecuteImmediateTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseExecuteImmediate1047a() {
-        plsql.parseResource("ExecuteImmediate1047a.pls");
+    public void parseExecuteImmediate1047a() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("ExecuteImmediate1047a.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
     @Test
-    public void parseExecuteImmediate1047b() {
-        plsql.parseResource("ExecuteImmediate1047b.pls");
+    public void parseExecuteImmediate1047b() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("ExecuteImmediate1047b.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/FunctionsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/FunctionsTest.java
index 2f4b1bd2dd..ea78ede269 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/FunctionsTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/FunctionsTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,12 +15,18 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class FunctionsTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseTrimCall() {
-        plsql.parseResource("TrimFunction.pls");
+    public void parseTrimCall() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("TrimFunction.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
     @Test
-    public void parseSelectExtractExpression() {
-        plsql.parseResource("ExtractExpressions.pls");
+    public void parseSelectExtractExpression() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("ExtractExpressions.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/IfStatementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/IfStatementTest.java
index acb57a2a4f..b5422b6a04 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/IfStatementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/IfStatementTest.java
@@ -14,7 +14,7 @@ public class IfStatementTest extends AbstractPLSQLParserTst {
     @Test
     public void parseIfWithElseIf() throws Exception {
         String code = "BEGIN\nIF 1 = 1 THEN null;\nELSIF (2 = 2) THEN null;\nELSE null;\nEND IF;\nEND;\n/\n";
-        ASTInput input = plsql.parse(code);
+        ASTInput input = parsePLSQL(code);
         Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InsertIntoClauseTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InsertIntoClauseTest.java
index fd8bbbe7a3..16b8614eef 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InsertIntoClauseTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/InsertIntoClauseTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,17 +15,26 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class InsertIntoClauseTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseInsertInto() {
-        plsql.parseResource("InsertIntoClause.pls");
+    public void parseInsertInto() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("InsertIntoClause.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
     @Test
-    public void parseInsertIntoReturning() {
-        plsql.parseResource("InsertIntoClauseReturning.pls");
+    public void parseInsertIntoReturning() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("InsertIntoClauseReturning.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
     @Test
-    public void parseInsertIntoWithRecord() {
-        plsql.parseResource("InsertIntoClauseRecord.pls");
+    public void parseInsertIntoWithRecord() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("InsertIntoClauseRecord.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/JoinClauseTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/JoinClauseTest.java
index 8e2413ab38..a15ceaa7dd 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/JoinClauseTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/JoinClauseTest.java
@@ -4,8 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -14,8 +16,10 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class JoinClauseTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void testInnerCrossJoin() {
-        ASTInput input = plsql.parseResource("InnerCrossJoin.pls");
+    public void testInnerCrossJoin() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("InnerCrossJoin.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTInnerCrossJoinClause> joins = input.findDescendantsOfType(ASTInnerCrossJoinClause.class);
         Assert.assertEquals(1, joins.size());
         Assert.assertTrue(joins.get(0).isCross());
@@ -23,8 +27,10 @@ public class JoinClauseTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void testInnerNaturalJoin() {
-        ASTInput input = plsql.parseResource("InnerNaturalJoin.pls");
+    public void testInnerNaturalJoin() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("InnerNaturalJoin.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTInnerCrossJoinClause> joins = input.findDescendantsOfType(ASTInnerCrossJoinClause.class);
         Assert.assertEquals(2, joins.size());
         Assert.assertFalse(joins.get(0).isCross());
@@ -32,8 +38,10 @@ public class JoinClauseTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void testInnerJoinUsing() {
-        ASTInput input = plsql.parseResource("InnerJoinUsing.pls");
+    public void testInnerJoinUsing() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("InnerJoinUsing.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTInnerCrossJoinClause> joins = input.findDescendantsOfType(ASTInnerCrossJoinClause.class);
         Assert.assertEquals(3, joins.size());
         Assert.assertFalse(joins.get(0).isCross());
@@ -44,8 +52,10 @@ public class JoinClauseTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void testOuterJoinUsing() {
-        ASTInput input = plsql.parseResource("OuterJoinUsing.pls");
+    public void testOuterJoinUsing() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("OuterJoinUsing.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTOuterJoinClause> joins = input.findDescendantsOfType(ASTOuterJoinClause.class);
         Assert.assertEquals(1, joins.size());
         ASTOuterJoinType type = joins.get(0).getFirstChildOfType(ASTOuterJoinType.class);
@@ -56,8 +66,10 @@ public class JoinClauseTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void testRightOuterJoin() {
-        ASTInput input = plsql.parseResource("RightOuterJoin.pls");
+    public void testRightOuterJoin() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("RightOuterJoin.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTOuterJoinClause> joins = input.findDescendantsOfType(ASTOuterJoinClause.class);
         Assert.assertEquals(2, joins.size());
         ASTOuterJoinType type = joins.get(0).getFirstChildOfType(ASTOuterJoinType.class);
@@ -65,8 +77,10 @@ public class JoinClauseTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void testLeftOuterJoin() {
-        ASTInput input = plsql.parseResource("LeftOuterJoin.pls");
+    public void testLeftOuterJoin() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("LeftOuterJoin.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTOuterJoinClause> joins = input.findDescendantsOfType(ASTOuterJoinClause.class);
         Assert.assertEquals(2, joins.size());
         ASTOuterJoinType type = joins.get(0).getFirstChildOfType(ASTOuterJoinType.class);
@@ -79,8 +93,10 @@ public class JoinClauseTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void testNaturalRightOuterJoin() {
-        ASTInput input = plsql.parseResource("NaturalRightOuterJoin.pls");
+    public void testNaturalRightOuterJoin() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("NaturalRightOuterJoin.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTOuterJoinClause> joins = input.findDescendantsOfType(ASTOuterJoinClause.class);
         Assert.assertEquals(1, joins.size());
         ASTOuterJoinType type = joins.get(0).getFirstChildOfType(ASTOuterJoinType.class);
@@ -89,8 +105,10 @@ public class JoinClauseTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void testOuterJoinPartitioned() {
-        ASTInput input = plsql.parseResource("OuterJoinPartitioned.pls");
+    public void testOuterJoinPartitioned() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("OuterJoinPartitioned.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTOuterJoinClause> joins = input.findDescendantsOfType(ASTOuterJoinClause.class);
         Assert.assertEquals(1, joins.size());
         ASTOuterJoinType type = joins.get(0).getFirstChildOfType(ASTOuterJoinType.class);
@@ -99,18 +117,24 @@ public class JoinClauseTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void testFullOuterJoin() {
-        plsql.parseResource("FullOuterJoin.pls");
+    public void testFullOuterJoin() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("FullOuterJoin.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testInnerJoinSubquery() {
-        plsql.parseResource("InnerJoinSubquery.pls");
+    public void testInnerJoinSubquery() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("InnerJoinSubquery.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testJoinOperator() {
-        ASTInput input = plsql.parseResource("JoinOperator.pls");
+    public void testJoinOperator() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("JoinOperator.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTOuterJoinExpression> expressions = input.findDescendantsOfType(ASTOuterJoinExpression.class);
         Assert.assertEquals(4, expressions.size());
         Assert.assertEquals("h.opp_id", expressions.get(3).getImage());
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/OrderByExpressionsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/OrderByExpressionsTest.java
index 8c729df6dc..05055fed04 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/OrderByExpressionsTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/OrderByExpressionsTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,7 +15,10 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class OrderByExpressionsTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseOrderByExpression() {
-        plsql.parseResource("OrderByExpression.pls");
+    public void parseOrderByExpression() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("OrderByExpression.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTest.java
deleted file mode 100644
index 0caea6b6f7..0000000000
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.plsql.ast;
-
-import org.junit.Test;
-
-import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-
-public class PLSQLParserTest extends AbstractPLSQLParserTst {
-
-    @Test
-    public void testExceptions() {
-        plsql.parse("CREATE OR REPLACE PROCEDURE bar IS BEGIN" + "    doSomething;" + "    EXCEPTION"
-                       + "    WHEN FooException THEN" + "        doSomethingElse;" + "    WHEN OTHERS THEN"
-                       + "        doSomethingElse;" + "END;");
-    }
-
-    /**
-     * See https://sourceforge.net/p/pmd/bugs/1167/
-     */
-    @Test
-    public void testBOM() {
-        plsql.parse("\ufeff" + "CREATE OR REPLACE PROCEDURE bar IS BEGIN" + "    doSomething;" + "    EXCEPTION"
-                       + "    WHEN FooException THEN" + "        doSomethingElse;" + "    WHEN OTHERS THEN"
-                       + "        doSomethingElse;" + "END;");
-    }
-
-    @Test(timeout = 5000)
-    public void testBug1531() {
-        plsql.parse("create or replace force view oxa.o_xa_function_role_types as\n"
-                       + "select \"CFT_ID\",\"CFR_ID\",\"CFT_NAME\",\"TCN\",\"LOG_MODULE\",\"LOG_USER\",\"LOG_DATE\",\"LOG_TIME\" from crm_function_role_types\n"
-                       + "/");
-    }
-
-    @Test
-    public void testBug1527() {
-        plsql.parseResource("InlinePragmaProcError.pls");
-    }
-
-    @Test
-    public void testBug1520IsOfType() {
-        plsql.parseResource("IsOfType.pls");
-    }
-
-    @Test
-    public void testBug1520Using() {
-        plsql.parseResource("Using.pls");
-    }
-
-    @Test
-    public void testSingleLineSelect() {
-        plsql.parseResource("SingleLineSelect.pls");
-    }
-
-    @Test
-    public void testMultiLineSelect() {
-        plsql.parseResource("MultiLineSelect.pls");
-    }
-
-    @Test
-    public void testIsNull() {
-        plsql.parseResource("IsNull.pls");
-    }
-
-    @Test
-    public void testCodingStyleExample() {
-        plsql.parseResource("CodingStyleExample.pls");
-    }
-
-    @Test
-    public void testCaseIssue1454() {
-        plsql.parseResource("CaseIssue1454.pls");
-    }
-}
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/RecordTypeTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/RecordTypeTest.java
index 0d8235820d..1b0a3f4e06 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/RecordTypeTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/RecordTypeTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,7 +15,10 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class RecordTypeTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseRecordType() {
-        plsql.parseResource("RecordType.pls");
+    public void parseRecordType() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("RecordType.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectExpressionsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectExpressionsTest.java
index 53737bbd97..16a10d9c73 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectExpressionsTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectExpressionsTest.java
@@ -4,8 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -14,13 +16,18 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class SelectExpressionsTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseSelectExpression() {
-        plsql.parseResource("SelectExpressions.pls");
+    public void parseSelectExpression() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectExpressions.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
     @Test
-    public void parseSelectSimpleExpression() {
-        ASTInput input = plsql.parseResource("SelectSimpleExpression.pls");
+    public void parseSelectSimpleExpression() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectSimpleExpression.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         Assert.assertNotNull(input);
 
         List<ASTSimpleExpression> simpleExpressions = input.findDescendantsOfType(ASTSimpleExpression.class);
@@ -33,12 +40,18 @@ public class SelectExpressionsTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void parseSelectCount() {
-        plsql.parseResource("SelectCount.pls");
+    public void parseSelectCount() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectCount.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
     @Test
-    public void parseSelectSubqueryExpression() {
-        plsql.parseResource("SelectSubqueryExpressions.pls");
+    public void parseSelectSubqueryExpression() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectSubqueryExpressions.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectForUpdateTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectForUpdateTest.java
index 125483aa07..7b655488f6 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectForUpdateTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectForUpdateTest.java
@@ -4,8 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -14,15 +16,19 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class SelectForUpdateTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseSelectForUpdateWait() {
-        ASTInput input = plsql.parseResource("SelectForUpdateWait.pls");
+    public void parseSelectForUpdateWait() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectForUpdateWait.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         Assert.assertNotNull(input);
         Assert.assertEquals(5, input.findDescendantsOfType(ASTForUpdateClause.class).size());
     }
 
     @Test
-    public void parseSelectForUpdate() {
-        ASTInput input = plsql.parseResource("SelectForUpdate.pls");
+    public void parseSelectForUpdate() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectForUpdate.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         Assert.assertNotNull(input);
         List<ASTForUpdateClause> forUpdateClauses = input.findDescendantsOfType(ASTForUpdateClause.class);
         Assert.assertEquals(2, forUpdateClauses.size());
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectHierarchicalTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectHierarchicalTest.java
index 7af37055ca..f2809c982a 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectHierarchicalTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectHierarchicalTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,7 +15,10 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class SelectHierarchicalTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseSelectHierarchicalQueries() {
-        plsql.parseResource("SelectHierarchical.pls");
+    public void parseSelectHierarchicalQueries() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectHierarchical.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoStatementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoStatementTest.java
index cd414650ac..61b192fc2d 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoStatementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoStatementTest.java
@@ -4,6 +4,9 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,42 +14,58 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class SelectIntoStatementTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void testParsingComplex() {
-        plsql.parseResource("SelectIntoStatement.pls");
+    public void testParsingComplex() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoStatement.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testParsingExample1() {
-        plsql.parseResource("SelectIntoStatementExample1.pls");
+    public void testParsingExample1() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoStatementExample1.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testParsingExample2() {
-        plsql.parseResource("SelectIntoStatementExample2.pls");
+    public void testParsingExample2() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoStatementExample2.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testParsingExample3() {
-        plsql.parseResource("SelectIntoStatementExample3.pls");
+    public void testParsingExample3() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoStatementExample3.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testParsingExample4() {
-        plsql.parseResource("SelectIntoStatementExample4.pls");
+    public void testParsingExample4() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoStatementExample4.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testParsingExample5() {
-        plsql.parseResource("SelectIntoStatementExample5.pls");
+    public void testParsingExample5() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoStatementExample5.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testParsingWithFunctionCall() {
-        plsql.parseResource("SelectIntoStatementFunctionCall.pls");
+    public void testParsingWithFunctionCall() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoStatementFunctionCall.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testParsingIntoRecordField() {
-        plsql.parseResource("SelectIntoStatementRecordField.pls");
+    public void testParsingIntoRecordField() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoStatementRecordField.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoWithGroupByTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoWithGroupByTest.java
index 76225c466c..3eeeec46cd 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoWithGroupByTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectIntoWithGroupByTest.java
@@ -4,8 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -14,30 +16,38 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class SelectIntoWithGroupByTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void testExample1() {
-        ASTInput input = plsql.parseResource("SelectIntoWithGroupBy1.pls");
+    public void testExample1() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoWithGroupBy1.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         ASTGroupByClause groupByClause = input.getFirstDescendantOfType(ASTGroupByClause.class);
         Assert.assertNotNull(groupByClause);
     }
 
     @Test
-    public void testExample2() {
-        ASTInput input = plsql.parseResource("SelectIntoWithGroupBy2.pls");
+    public void testExample2() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoWithGroupBy2.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         ASTGroupByClause groupByClause = input.getFirstDescendantOfType(ASTGroupByClause.class);
         Assert.assertNotNull(groupByClause);
     }
 
     @Test
-    public void testExample3WithCube() {
-        ASTInput input = plsql.parseResource("SelectIntoWithGroupBy3.pls");
+    public void testExample3WithCube() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoWithGroupBy3.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         ASTRollupCubeClause cubeClause = input.getFirstDescendantOfType(ASTRollupCubeClause.class);
         Assert.assertNotNull(cubeClause);
         Assert.assertEquals("CUBE", cubeClause.getImage());
     }
 
     @Test
-    public void testExample4WithGroupingSets() {
-        ASTInput input = plsql.parseResource("SelectIntoWithGroupBy4.pls");
+    public void testExample4WithGroupingSets() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectIntoWithGroupBy4.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         ASTGroupingSetsClause groupingSetsClause = input.getFirstDescendantOfType(ASTGroupingSetsClause.class);
         Assert.assertNotNull(groupingSetsClause);
 
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectUnionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectUnionTest.java
index d213f4883c..5118f00574 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectUnionTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/SelectUnionTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,8 +15,11 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class SelectUnionTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseSelectUnion() {
-        plsql.parseResource("SelectUnion.pls");
+    public void parseSelectUnion() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("SelectUnion.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TableCollectionExpressionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TableCollectionExpressionTest.java
index 51172989cf..1daad5882a 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TableCollectionExpressionTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TableCollectionExpressionTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,12 +15,18 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class TableCollectionExpressionTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void testExamples() {
-        plsql.parseResource("TableCollectionExpressionExamples.pls");
+    public void testExamples() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("TableCollectionExpressionExamples.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
     @Test
-    public void testIssue1526() {
-        plsql.parseResource("TableCollectionExpressionIssue1526.pls");
+    public void testIssue1526() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("TableCollectionExpressionIssue1526.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TrimWithRecordTypeTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TrimWithRecordTypeTest.java
index 9715fa9918..8f92db5209 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TrimWithRecordTypeTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/TrimWithRecordTypeTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,7 +15,10 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class TrimWithRecordTypeTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseTrimWithRecordType() {
-        plsql.parseResource("TrimWithRecordType.pls");
+    public void parseTrimWithRecordType() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("TrimWithRecordType.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/UpdateStatementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/UpdateStatementTest.java
index 9a56a576ec..f5abafb4f6 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/UpdateStatementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/UpdateStatementTest.java
@@ -14,7 +14,8 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class UpdateStatementTest extends AbstractPLSQLParserTst {
     @Test
     public void parseUpdateStatementExample() {
-        ASTInput input = plsql.parseResource("UpdateStatementExample.pls");
+        String code = loadTestResource("UpdateStatementExample.pls");
+        ASTInput input = parsePLSQL(code);
         List<ASTUpdateStatement> updateStatements = input.findDescendantsOfType(ASTUpdateStatement.class);
         Assert.assertEquals(2, updateStatements.size());
         Assert.assertEquals(2, updateStatements.get(1).getFirstChildOfType(ASTUpdateSetClause.class)
@@ -23,13 +24,13 @@ public class UpdateStatementTest extends AbstractPLSQLParserTst {
 
     @Test
     public void parseUpdateStatementExample2() {
-        ASTInput input = plsql.parseResource("UpdateStatementExample2.pls");
+        ASTInput input = parsePLSQL(loadTestResource("UpdateStatementExample2.pls"));
         Assert.assertNotNull(input);
     }
 
     @Test
     public void parseUpdateStatementRef() {
-        ASTInput input = plsql.parseResource("UpdateStatementRef.pls");
+        ASTInput input = parsePLSQL(loadTestResource("UpdateStatementRef.pls"));
         Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ViewTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ViewTest.java
index e62509f89b..a00f2f8710 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ViewTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ViewTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,17 +15,26 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class ViewTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void parseCreateViewIssue981() {
-        plsql.parseResource("ViewIssue981.pls");
+    public void parseCreateViewIssue981() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("ViewIssue981.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
     @Test
-    public void parseCreateView() {
-        plsql.parseResource("CreateViewWithSubquery.pls");
+    public void parseCreateView() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("CreateViewWithSubquery.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 
     @Test
-    public void parseCreateViewWithoutSemicolon() {
-        plsql.parseResource("QueryWithoutSemicolon.sql");
+    public void parseCreateViewWithoutSemicolon() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("QueryWithoutSemicolon.sql"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/WhereClauseTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/WhereClauseTest.java
index 96440c0b15..038fa3e5e6 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/WhereClauseTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/WhereClauseTest.java
@@ -4,8 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -14,8 +16,10 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class WhereClauseTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void testFunctionCall() {
-        ASTInput input = plsql.parseResource("WhereClauseFunctionCall.pls");
+    public void testFunctionCall() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseFunctionCall.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTSelectIntoStatement> selectStatements = input.findDescendantsOfType(ASTSelectIntoStatement.class);
         Assert.assertEquals(4, selectStatements.size());
 
@@ -27,48 +31,66 @@ public class WhereClauseTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void testLikeCondition() {
-        plsql.parseResource("WhereClauseLike.pls");
+    public void testLikeCondition() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseLike.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testNullCondition() {
-        plsql.parseResource("WhereClauseIsNull.pls");
+    public void testNullCondition() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseIsNull.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testBetweenCondition() {
-        plsql.parseResource("WhereClauseBetween.pls");
+    public void testBetweenCondition() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseBetween.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testInCondition() {
-        plsql.parseResource("WhereClauseIn.pls");
+    public void testInCondition() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseIn.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testIsOfTypeCondition() {
-        plsql.parseResource("WhereClauseIsOfType.pls");
+    public void testIsOfTypeCondition() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseIsOfType.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testConcatenationOperator() {
-        plsql.parseResource("WhereClauseConcatenation.pls");
+    public void testConcatenationOperator() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseConcatenation.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testExistsCondition() {
-        plsql.parseResource("WhereClauseExists.pls");
+    public void testExistsCondition() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseExists.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testMultisetCondition() {
-        plsql.parseResource("WhereClauseMultiset.pls");
+    public void testMultisetCondition() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseMultiset.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testRegexpLikeCondition() {
-        ASTInput input = plsql.parseResource("WhereClauseRegexpLike.pls");
+    public void testRegexpLikeCondition() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseRegexpLike.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
         List<ASTRegexpLikeCondition> regexps = input.findDescendantsOfType(ASTRegexpLikeCondition.class);
         Assert.assertEquals(3, regexps.size());
         Assert.assertEquals("last_name", regexps.get(1).getSourceChar().getImage());
@@ -77,12 +99,16 @@ public class WhereClauseTest extends AbstractPLSQLParserTst {
     }
 
     @Test
-    public void testSubqueries() {
-        plsql.parseResource("WhereClauseSubqueries.pls");
+    public void testSubqueries() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseSubqueries.pls"),
+                StandardCharsets.UTF_8);
+        ASTInput input = parsePLSQL(code);
     }
 
     @Test
-    public void testParentheses() {
-        plsql.parseResource("WhereClauseParens.pls");
+    public void testParentheses() throws Exception {
+        String code = IOUtils.toString(this.getClass().getResourceAsStream("WhereClauseParens.pls"),
+                StandardCharsets.UTF_8);
+        parsePLSQL(code);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLElementTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLElementTest.java
index 32f8d1b555..31781cb261 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLElementTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLElementTest.java
@@ -4,8 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -14,8 +16,10 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class XMLElementTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void testParseXMLElement() {
-        ASTInput input = plsql.parseResource("XMLElement.pls");
+    public void testParseXMLElement() throws Exception {
+        ASTInput input = parsePLSQL(IOUtils.toString(this.getClass().getResourceAsStream("XMLElement.pls"),
+                StandardCharsets.UTF_8));
+        Assert.assertNotNull(input);
         List<ASTXMLElement> xmlelements = input.findDescendantsOfType(ASTXMLElement.class);
         Assert.assertEquals(10, xmlelements.size());
         Assert.assertEquals("\"Emp\"", xmlelements.get(0).getFirstChildOfType(ASTID.class).getImage());
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLTableTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLTableTest.java
index 25d129b1fd..476a35e29a 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLTableTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/XMLTableTest.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
@@ -11,7 +15,9 @@ import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
 public class XMLTableTest extends AbstractPLSQLParserTst {
 
     @Test
-    public void testParseXMLTable() {
-        plsql.parseResource("XMLTable.pls");
+    public void testParseXMLTable() throws Exception {
+        ASTInput input = parsePLSQL(IOUtils.toString(this.getClass().getResourceAsStream("XMLTable.pls"),
+                StandardCharsets.UTF_8));
+        Assert.assertNotNull(input);
     }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java
index d75ce4985b..91ce778b57 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java
@@ -12,12 +12,13 @@ import java.util.List;
 import org.junit.Test;
 
 import net.sourceforge.pmd.PMD;
+import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.AbstractNode;
 import net.sourceforge.pmd.lang.dfa.DataFlowNode;
 import net.sourceforge.pmd.lang.dfa.NodeType;
 import net.sourceforge.pmd.lang.dfa.StartOrEndDataFlowNode;
 import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
-import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper;
+import net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule;
 import net.sourceforge.pmd.lang.plsql.ast.ASTExpression;
 import net.sourceforge.pmd.lang.plsql.ast.ASTMethodDeclaration;
 import net.sourceforge.pmd.lang.plsql.ast.ASTProgramUnit;
@@ -26,19 +27,13 @@ import net.sourceforge.pmd.lang.plsql.ast.PLSQLNode;
 
 public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
 
-    private final PlsqlParsingHelper plsql = PlsqlParsingHelper.WITH_PROCESSING.withResourceContext(StatementAndBraceFinderTest.class);
-
-    private ASTExpression getExpr(String test1) {
-        return plsql.parse(test1).getFirstDescendantOfType(ASTExpression.class);
-    }
-
     /**
      * Java ASTStatementExpression equivalent is inferred as an Expression()
      * which has an UnlabelledStatement as a parent.
      */
     @Test
     public void testExpressionParentChildLinks() {
-        ASTExpression ex = getExpr(TEST1);
+        ASTExpression ex = getOrderedNodes(ASTExpression.class, TEST1).get(0);
         DataFlowNode dfn = ex.getDataFlowNode();
         assertEquals(3, dfn.getLine());
         assertTrue(dfn.getNode() instanceof ASTExpression);
@@ -53,10 +48,9 @@ public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
         assertEquals(exParent, ex.getDataFlowNode().getParents().get(0).getNode());
     }
 
-
     @Test
     public void testVariableOrConstantDeclaratorParentChildLinks() {
-        ASTVariableOrConstantDeclarator vd = plsql.getNodes(ASTVariableOrConstantDeclarator.class, TEST2).get(0);
+        ASTVariableOrConstantDeclarator vd = getOrderedNodes(ASTVariableOrConstantDeclarator.class, TEST2).get(0);
         // ASTMethodDeclaration vdParent = (ASTMethodDeclaration)
         // ((DataFlowNode) vd.getDataFlowNode().getParents().get(0)).getNode();
         ASTProgramUnit vdParent = (ASTProgramUnit) vd.getDataFlowNode().getParents().get(0).getNode();
@@ -67,7 +61,7 @@ public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
 
     @Test
     public void testIfStmtHasCorrectTypes() {
-        ASTExpression exp = getExpr(TEST3);
+        ASTExpression exp = getOrderedNodes(ASTExpression.class, TEST3).get(0);
         assertEquals(5, exp.getDataFlowNode().getFlow().size());
         DataFlowNode dfn = exp.getDataFlowNode().getFlow().get(2);
         assertTrue(dfn.isType(NodeType.IF_EXPR));
@@ -79,7 +73,7 @@ public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
 
     @Test
     public void testWhileStmtHasCorrectTypes() {
-        ASTExpression exp = getExpr(TEST4);
+        ASTExpression exp = getOrderedNodes(ASTExpression.class, TEST4).get(0);
         DataFlowNode dfn = exp.getDataFlowNode().getFlow().get(2);
         assertTrue(dfn.isType(NodeType.WHILE_EXPR));
         dfn = exp.getDataFlowNode().getFlow().get(3);
@@ -88,7 +82,7 @@ public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
 
     @Test
     public void testForStmtHasCorrectTypes() {
-        ASTExpression exp = getExpr(TEST5);
+        ASTExpression exp = getOrderedNodes(ASTExpression.class, TEST5).get(0);
         DataFlowNode dfn = null;
         dfn = exp.getDataFlowNode().getFlow().get(0);
         assertTrue(dfn instanceof StartOrEndDataFlowNode);
@@ -106,7 +100,7 @@ public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
 
     @Test
     public void testSimpleCaseStmtHasCorrectTypes() {
-        ASTExpression exp = getExpr(TEST6);
+        ASTExpression exp = getOrderedNodes(ASTExpression.class, TEST6).get(0);
         DataFlowNode dfn = null;
         dfn = exp.getDataFlowNode().getFlow().get(0);
         assertTrue(dfn instanceof StartOrEndDataFlowNode);
@@ -135,25 +129,25 @@ public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
      * { List<ASTStatement> statements = getOrderedNodes(ASTStatement.class,
      * TEST7); List<ASTExpression> expressions =
      * getOrderedNodes(ASTExpression.class, TEST7);
-     *
+     * 
      * ASTStatement st = statements.get(0); ASTStatement st1 =
      * statements.get(1); ASTStatement st2 = statements.get(2); ASTStatement st3
      * = statements.get(3);
      * System.err.println("testSearchedCaseStmtHasCorrectTypes-st(0)="+st.
      * getBeginLine());
-     *
+     * 
      * ASTExpression ex = expressions.get(0); ASTExpression ex1 =
      * expressions.get(1); ASTExpression ex2 = expressions.get(2); ASTExpression
      * ex3 = expressions.get(3); ASTExpression ex4 = expressions.get(4);
      * System.err.println("ASTExpression="+ex );
-     *
+     * 
      * DataFlowNode dfn = null; //dfn = ex.getDataFlowNode().getFlow().get(0);
      * //dfn = st.getDataFlowNode().getFlow().get(0); dfn = (DataFlowNode)
      * st.getDataFlowNode(); System.err.println("DataFlowNode(st-0)="+dfn ) ;
      * System.err.println("DataFlowNode(st-1)="+st1.getDataFlowNode() ) ;
      * System.err.println("DataFlowNode(st-2)="+st2.getDataFlowNode() ) ;
      * System.err.println("DataFlowNode(st-3)="+st3.getDataFlowNode() ) ;
-     *
+     * 
      * System.err.println("DataFlowNode(ex-0)="+ex.getDataFlowNode() ) ;
      * System.err.println("DataFlowNode(ex-1)="+ex1.getDataFlowNode() ) ;
      * System.err.println("DataFlowNode(ex-2)="+ex2.getDataFlowNode() ) ;
@@ -184,7 +178,7 @@ public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
      */
     @Test
     public void testLabelledStmtHasCorrectTypes() {
-        ASTExpression exp = getExpr(TEST8);
+        ASTExpression exp = getOrderedNodes(ASTExpression.class, TEST8).get(0);
         DataFlowNode dfn = exp.getDataFlowNode().getFlow().get(2);
         assertEquals(3, dfn.getLine());
         assertTrue(dfn.isType(NodeType.LABEL_STATEMENT));
@@ -192,7 +186,8 @@ public class StatementAndBraceFinderTest extends AbstractPLSQLParserTst {
 
     @Test
     public void testOnlyWorksForMethodsAndConstructors() {
-        StatementAndBraceFinder sbf = new StatementAndBraceFinder(plsql.getDefaultHandler().getDataFlowHandler());
+        StatementAndBraceFinder sbf = new StatementAndBraceFinder(LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler().getDataFlowHandler());
         PLSQLNode node = new ASTMethodDeclaration(1);
         ((AbstractNode) node).testingOnlySetBeginColumn(1);
         sbf.buildDataFlowFor(node);
diff --git a/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/BaseScalaTest.java b/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/BaseScalaTest.java
deleted file mode 100644
index 6b96899084..0000000000
--- a/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/BaseScalaTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.scala.ast;
-
-/**
- * @author Clément Fournier
- */
-public abstract class BaseScalaTest {
-
-    protected final ScalaParsingHelper scala = ScalaParsingHelper.DEFAULT.withResourceContext(getClass());
-
-}
diff --git a/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java b/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java
deleted file mode 100644
index ffa492221e..0000000000
--- a/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.scala.ast;
-
-import java.io.File;
-import java.io.StringReader;
-
-import org.jetbrains.annotations.NotNull;
-
-import net.sourceforge.pmd.PMD;
-import net.sourceforge.pmd.PMDException;
-import net.sourceforge.pmd.Report;
-import net.sourceforge.pmd.Rule;
-import net.sourceforge.pmd.RuleContext;
-import net.sourceforge.pmd.RuleSet;
-import net.sourceforge.pmd.RuleSetFactory;
-import net.sourceforge.pmd.RuleSets;
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
-import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
-
-public final class ScalaParsingHelper extends BaseParsingHelper<ScalaParsingHelper, ASTSource> {
-
-    public static final ScalaParsingHelper DEFAULT = new ScalaParsingHelper(Params.getDefaultProcess());
-
-    private ScalaParsingHelper(@NotNull Params params) {
-        super(ScalaLanguageModule.NAME, ASTSource.class, params);
-    }
-
-    @NotNull
-    @Override
-    protected ScalaParsingHelper clone(@NotNull Params params) {
-        return new ScalaParsingHelper(params);
-    }
-
-
-    public Report getReportForTestString(Rule rule, String testSourceCode) {
-        PMD p = new PMD();
-        RuleContext ctx = new RuleContext();
-        Report report = new Report();
-        ctx.setReport(report);
-        ctx.setSourceCodeFile(new File("test.scala"));
-        RuleSet rules = new RuleSetFactory().createSingleRuleRuleSet(rule);
-        try {
-            p.getSourceCodeProcessor().processSourceCode(new StringReader(testSourceCode), new RuleSets(rules), ctx);
-        } catch (PMDException e) {
-            throw new AssertionError(e);
-        }
-        return report;
-    }
-
-    public Report getReportForResource(Rule rule, String resourcePath) {
-        return getReportForTestString(rule, readResource(resourcePath));
-    }
-}
diff --git a/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java b/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java
index 84fb08439b..e3d0b2fd37 100644
--- a/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java
+++ b/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java
@@ -4,27 +4,42 @@
 
 package net.sourceforge.pmd.lang.scala.rule;
 
-import java.util.Collections;
+import java.io.File;
+import java.io.StringReader;
+import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
+import net.sourceforge.pmd.PMD;
+import net.sourceforge.pmd.PMDException;
 import net.sourceforge.pmd.Report;
+import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.RuleSet;
+import net.sourceforge.pmd.RuleSetFactory;
+import net.sourceforge.pmd.RuleSets;
 import net.sourceforge.pmd.internal.util.IteratorUtil;
-import net.sourceforge.pmd.lang.scala.ast.ASTSource;
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.LanguageVersionHandler;
+import net.sourceforge.pmd.lang.Parser;
+import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
 import net.sourceforge.pmd.lang.scala.ast.ASTTermApply;
 import net.sourceforge.pmd.lang.scala.ast.ASTTermName;
-import net.sourceforge.pmd.lang.scala.ast.BaseScalaTest;
 import net.sourceforge.pmd.lang.scala.ast.ScalaNode;
 
-public class ScalaRuleTest extends BaseScalaTest {
-
+public class ScalaRuleTest {
     private static final String SCALA_TEST = "/parserFiles/helloworld.scala";
 
     @Test
-    public void testRuleVisits() {
+    public void testRuleVisits() throws Exception {
+        LanguageVersionHandler scalaVersionHandler = LanguageRegistry.getLanguage(ScalaLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
+        Parser parser = scalaVersionHandler.getParser(scalaVersionHandler.getDefaultParserOptions());
+        ScalaNode<?> root = (ScalaNode<?>) parser.parse(null,
+                new StringReader(IOUtils.toString(getClass().getResourceAsStream(SCALA_TEST), "UTF-8")));
         final AtomicInteger visited = new AtomicInteger();
         ScalaRule rule = new ScalaRule() {
 
@@ -34,13 +49,12 @@ public class ScalaRuleTest extends BaseScalaTest {
                 return super.visit(node, data);
             }
         };
-        ASTSource root = scala.parseResource(SCALA_TEST);
-        rule.apply(Collections.singletonList(root), null);
+        rule.apply(Arrays.asList(root), null);
         Assert.assertEquals(12, visited.get());
     }
 
     @Test
-    public void testDummyRule() {
+    public void testDummyRule() throws Exception {
         ScalaRule rule = new ScalaRule() {
             @Override
             public RuleContext visit(ASTTermApply node, RuleContext data) {
@@ -51,9 +65,21 @@ public class ScalaRuleTest extends BaseScalaTest {
                 return data;
             }
         };
-        Report report = scala.getReportForResource(rule, SCALA_TEST);
+        Report report = getReportForTestString(rule,
+                IOUtils.toString(getClass().getResourceAsStream(SCALA_TEST), "UTF-8"));
 
         Assert.assertEquals(1, IteratorUtil.count(report.iterator()));
     }
 
+    private static Report getReportForTestString(Rule r, String test) throws PMDException {
+        PMD p = new PMD();
+        RuleContext ctx = new RuleContext();
+        Report report = new Report();
+        ctx.setReport(report);
+        ctx.setSourceCodeFile(new File("test.scala"));
+        RuleSet rules = new RuleSetFactory().createSingleRuleRuleSet(r);
+        p.getSourceCodeProcessor().processSourceCode(new StringReader(test), new RuleSets(rules), ctx);
+        return report;
+    }
+
 }
diff --git a/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/XPathRuleTest.java b/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/XPathRuleTest.java
index 484b8508a7..31de1124f4 100644
--- a/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/XPathRuleTest.java
+++ b/pmd-scala/src/test/java/net/sourceforge/pmd/lang/scala/rule/XPathRuleTest.java
@@ -6,19 +6,29 @@ package net.sourceforge.pmd.lang.scala.rule;
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.File;
+import java.io.StringReader;
+
+import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Test;
 
+import net.sourceforge.pmd.PMD;
+import net.sourceforge.pmd.PMDException;
 import net.sourceforge.pmd.Report;
+import net.sourceforge.pmd.Rule;
+import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.RuleSet;
+import net.sourceforge.pmd.RuleSetFactory;
+import net.sourceforge.pmd.RuleSets;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.rule.XPathRule;
 import net.sourceforge.pmd.lang.rule.xpath.XPathRuleQuery;
 import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
-import net.sourceforge.pmd.lang.scala.ast.BaseScalaTest;
-
-public class XPathRuleTest extends BaseScalaTest {
+import net.sourceforge.pmd.testframework.RuleTst;
 
+public class XPathRuleTest extends RuleTst {
     private static final String SCALA_TEST = "/parserFiles/helloworld.scala";
 
     XPathRule rule;
@@ -31,13 +41,24 @@ public class XPathRuleTest extends BaseScalaTest {
     }
 
     @Test
-    public void testPrintHelloWorld() {
+    public void testPrintHelloWorld() throws Exception {
         String xpath = "//TermApply/TermName[@Image=\"println\"]";
         rule.setXPath(xpath);
         rule.setVersion(XPathRuleQuery.XPATH_2_0);
-        Report report = scala.getReportForResource(rule, SCALA_TEST);
+        Report report = getReportForTestString(rule,
+                IOUtils.toString(getClass().getResourceAsStream(SCALA_TEST), "UTF-8"));
         RuleViolation rv = report.iterator().next();
         assertEquals(2, rv.getBeginLine());
     }
 
+    private static Report getReportForTestString(Rule r, String test) throws PMDException {
+        PMD p = new PMD();
+        RuleContext ctx = new RuleContext();
+        Report report = new Report();
+        ctx.setReport(report);
+        ctx.setSourceCodeFile(new File("test.scala"));
+        RuleSet rules = new RuleSetFactory().createSingleRuleRuleSet(r);
+        p.getSourceCodeProcessor().processSourceCode(new StringReader(test), new RuleSets(rules), ctx);
+        return report;
+    }
 }
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index 70218efbc3..d4b0d3dd42 100644
--- a/pmd-visualforce/pom.xml
+++ b/pmd-visualforce/pom.xml
@@ -93,20 +93,10 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-lang-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/VfParserTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/VfParserTest.java
new file mode 100644
index 0000000000..3e40cc7e44
--- /dev/null
+++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/VfParserTest.java
@@ -0,0 +1,48 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.vf;
+
+import java.io.StringReader;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.LanguageVersionHandler;
+import net.sourceforge.pmd.lang.Parser;
+import net.sourceforge.pmd.lang.ast.Node;
+
+/**
+ * @author sergey.gorbaty
+ *
+ */
+public class VfParserTest {
+
+    @Test
+    public void testSingleDoubleQuoteAndEL() {
+        Node node = parse("<span escape='false' attrib=\"{!call}\">${!'yes'}</span>");
+        Assert.assertNotNull(node);
+    }
+
+    @Test
+    public void testSingleDoubleQuoteAndELFunction() {
+        Node node = parse("<span escape='false' attrib=\"{!call}\">${!method}</span>");
+        Assert.assertNotNull(node);
+    }
+    
+    @Test
+    public void testSingleDoubleQuote() {
+        Node node = parse("<span escape='false' attrib=\"{!call}\">${\"yes\"}</span>");
+        Assert.assertNotNull(node);
+    }
+
+    private Node parse(String code) {
+        LanguageVersionHandler vfLang = LanguageRegistry.getLanguage(VfLanguageModule.NAME).getDefaultVersion()
+                .getLanguageVersionHandler();
+        Parser parser = vfLang.getParser(vfLang.getDefaultParserOptions());
+        Node node = parser.parse(null, new StringReader(code));
+        return node;
+    }
+}
diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/AbstractVfNodesTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/AbstractVfNodesTest.java
index d905a3817a..faaceb1bdf 100644
--- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/AbstractVfNodesTest.java
+++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/AbstractVfNodesTest.java
@@ -4,8 +4,70 @@
 
 package net.sourceforge.pmd.lang.vf.ast;
 
+import static org.junit.Assert.assertEquals;
+
+import java.io.StringReader;
+import java.util.HashSet;
+import java.util.Set;
+
+import net.sourceforge.pmd.lang.ast.JavaCharStream;
+import net.sourceforge.pmd.lang.ast.Node;
+
 public abstract class AbstractVfNodesTest {
 
-    protected final VfParsingHelper vf = VfParsingHelper.DEFAULT.withResourceContext(getClass());
+    public <T extends VfNode> void assertNumberOfNodes(Class<T> clazz, String source, int number) {
+        Set<T> nodes = getNodes(clazz, source);
+        assertEquals("Exactly " + number + " element(s) expected", number, nodes.size());
+    }
+
+    /**
+     * Run the VF parser on the source, and return the nodes of type clazz.
+     *
+     * @param clazz
+     * @param source
+     * @return Set
+     */
+    public <T extends VfNode> Set<T> getNodes(Class<T> clazz, String source) {
+        VfParser parser = new VfParser(new JavaCharStream(new StringReader(source)));
+        Node rootNode = parser.CompilationUnit();
+        Set<T> nodes = new HashSet<>();
+        addNodeAndSubnodes(rootNode, nodes, clazz);
+        return nodes;
+    }
+
+    /**
+     * Return a subset of allNodes, containing the items in allNodes that are of
+     * the given type.
+     *
+     * @param clazz
+     * @param allNodes
+     * @return Set
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends VfNode> Set<T> getNodesOfType(Class<T> clazz, Set<VfNode> allNodes) {
+        Set<T> result = new HashSet<>();
+        for (Node node : allNodes) {
+            if (clazz.equals(node.getClass())) {
+                result.add((T) node);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Add the given node and its subnodes to the set of nodes. If clazz is not
+     * null, only nodes of the given class are put in the set of nodes.
+     */
+    @SuppressWarnings("unchecked")
+    private <T extends VfNode> void addNodeAndSubnodes(Node node, Set<T> nodes, Class<T> clazz) {
+        if (null != node) {
+            if ((null == clazz) || (clazz.equals(node.getClass()))) {
+                nodes.add((T) node);
+            }
+            for (int i = 0; i < node.jjtGetNumChildren(); i++) {
+                addNodeAndSubnodes(node.jjtGetChild(i), nodes, clazz);
+            }
+        }
+    }
 
 }
diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfDocStyleTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfDocStyleTest.java
index 17609b05fe..004cafddf2 100644
--- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfDocStyleTest.java
+++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfDocStyleTest.java
@@ -6,13 +6,14 @@ package net.sourceforge.pmd.lang.vf.ast;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import org.junit.Test;
 
@@ -20,7 +21,7 @@ import org.junit.Test;
  * Test parsing of a VF in document style, by checking the generated AST.
  * Original @author pieter_van_raemdonck - Application Engineers NV/SA -
  * www.ae.be
- *
+ * 
  * @author sergey.gorbaty - VF adaptation
  *
  */
@@ -31,8 +32,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testSimplestVf() {
-        List<ASTElement> nodes = vf.getNodes(ASTElement.class, TEST_SIMPLEST_HTML);
-        assertEquals("Exactly " + 1 + " element(s) expected", 1, nodes.size());
+        assertNumberOfNodes(ASTElement.class, TEST_SIMPLEST_HTML, 1);
     }
 
     /**
@@ -40,23 +40,22 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testElementAttributeAndNamespace() {
-        ASTCompilationUnit root = vf.parse(TEST_ELEMENT_AND_NAMESPACE);
+        Set<VfNode> nodes = getNodes(null, TEST_ELEMENT_AND_NAMESPACE);
 
-
-        List<ASTElement> elementNodes = root.findDescendantsOfType(ASTElement.class);
+        Set<ASTElement> elementNodes = getNodesOfType(ASTElement.class, nodes);
         assertEquals("One element node expected!", 1, elementNodes.size());
         ASTElement element = elementNodes.iterator().next();
         assertEquals("Correct name expected!", "h:html", element.getName());
-        assertTrue("Has namespace prefix!", element.isHasNamespacePrefix());
-        assertTrue("Element is empty!", element.isEmpty());
+        assertEquals("Has namespace prefix!", true, element.isHasNamespacePrefix());
+        assertEquals("Element is empty!", true, element.isEmpty());
         assertEquals("Correct namespace prefix of element expected!", "h", element.getNamespacePrefix());
         assertEquals("Correct local name of element expected!", "html", element.getLocalName());
 
-        List<ASTAttribute> attributeNodes = root.findDescendantsOfType(ASTAttribute.class);
+        Set<ASTAttribute> attributeNodes = getNodesOfType(ASTAttribute.class, nodes);
         assertEquals("One attribute node expected!", 1, attributeNodes.size());
         ASTAttribute attribute = attributeNodes.iterator().next();
         assertEquals("Correct name expected!", "MyNsPrefix:MyAttr", attribute.getName());
-        assertTrue("Has namespace prefix!", attribute.isHasNamespacePrefix());
+        assertEquals("Has namespace prefix!", true, attribute.isHasNamespacePrefix());
         assertEquals("Correct namespace prefix of element expected!", "MyNsPrefix", attribute.getNamespacePrefix());
         assertEquals("Correct local name of element expected!", "MyAttr", attribute.getLocalName());
 
@@ -69,24 +68,31 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testAttributeValueContainingHash() {
+        Set<VfNode> nodes = getNodes(null, TEST_ATTRIBUTE_VALUE_CONTAINING_HASH);
 
-        List<ASTAttribute> attributes = vf.getNodes(ASTAttribute.class, TEST_ATTRIBUTE_VALUE_CONTAINING_HASH);
+        Set<ASTAttribute> attributes = getNodesOfType(ASTAttribute.class, nodes);
         assertEquals("Three attributes expected!", 3, attributes.size());
 
-        ASTAttribute attr = attributes.get(0);
-        assertEquals("Correct attribute name expected!", "something", attr.getName());
-        assertEquals("Correct attribute value expected!", "#yes#",
-                     attr.getFirstDescendantOfType(ASTText.class).getImage());
+        List<ASTAttribute> attrsList = new ArrayList<>(attributes);
+        Collections.sort(attrsList, new Comparator<ASTAttribute>() {
+            public int compare(ASTAttribute arg0, ASTAttribute arg1) {
+                return arg0.getName().compareTo(arg1.getName());
+            }
+        });
 
-        attr = attributes.get(1);
+        ASTAttribute attr = attrsList.get(0);
         assertEquals("Correct attribute name expected!", "foo", attr.getName());
         assertEquals("Correct attribute value expected!", "CREATE",
                 attr.getFirstDescendantOfType(ASTText.class).getImage());
 
-        attr = attributes.get(2);
+        attr = attrsList.get(1);
         assertEquals("Correct attribute name expected!", "href", attr.getName());
         assertEquals("Correct attribute value expected!", "#", attr.getFirstDescendantOfType(ASTText.class).getImage());
 
+        attr = attrsList.get(2);
+        assertEquals("Correct attribute name expected!", "something", attr.getName());
+        assertEquals("Correct attribute value expected!", "#yes#",
+                attr.getFirstDescendantOfType(ASTText.class).getImage());
     }
 
     /**
@@ -94,7 +100,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testCData() {
-        List<ASTCData> cdataNodes = vf.getNodes(ASTCData.class, TEST_CDATA);
+        Set<ASTCData> cdataNodes = getNodes(ASTCData.class, TEST_CDATA);
 
         assertEquals("One CDATA node expected!", 1, cdataNodes.size());
         ASTCData cdata = cdataNodes.iterator().next();
@@ -106,14 +112,14 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testDoctype() {
-        ASTCompilationUnit root = vf.parse(TEST_DOCTYPE);
+        Set<VfNode> nodes = getNodes(null, TEST_DOCTYPE);
 
-        List<ASTDoctypeDeclaration> docTypeDeclarations = root.findDescendantsOfType(ASTDoctypeDeclaration.class);
+        Set<ASTDoctypeDeclaration> docTypeDeclarations = getNodesOfType(ASTDoctypeDeclaration.class, nodes);
         assertEquals("One doctype declaration expected!", 1, docTypeDeclarations.size());
         ASTDoctypeDeclaration docTypeDecl = docTypeDeclarations.iterator().next();
         assertEquals("Correct doctype-name expected!", "html", docTypeDecl.getName());
 
-        List<ASTDoctypeExternalId> externalIds = root.findDescendantsOfType(ASTDoctypeExternalId.class);
+        Set<ASTDoctypeExternalId> externalIds = getNodesOfType(ASTDoctypeExternalId.class, nodes);
         assertEquals("One doctype external id expected!", 1, externalIds.size());
         ASTDoctypeExternalId externalId = externalIds.iterator().next();
         assertEquals("Correct external public id expected!", "-//W3C//DTD XHTML 1.1//EN", externalId.getPublicId());
@@ -127,7 +133,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testHtmlScript() {
-        List<ASTHtmlScript> scripts = vf.getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT);
+        Set<ASTHtmlScript> scripts = getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT);
         assertEquals("One script expected!", 1, scripts.size());
         ASTHtmlScript script = scripts.iterator().next();
         ASTText text = script.getFirstChildOfType(ASTText.class);
@@ -139,7 +145,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testELInTagValue() {
-        List<ASTElement> elememts = vf.getNodes(ASTElement.class, TEST_EL_IN_TAG_ATTRIBUTE);
+        Set<ASTElement> elememts = getNodes(ASTElement.class, TEST_EL_IN_TAG_ATTRIBUTE);
         assertEquals("One element expected!", 1, elememts.size());
         ASTElement element = elememts.iterator().next();
         ASTAttributeValue attribute = element.getFirstDescendantOfType(ASTAttributeValue.class);
@@ -153,7 +159,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testELInTagValueWithCommentDQ() {
-        List<ASTElement> elememts = vf.getNodes(ASTElement.class, TEST_EL_IN_TAG_ATTRIBUTE_WITH_COMMENT);
+        Set<ASTElement> elememts = getNodes(ASTElement.class, TEST_EL_IN_TAG_ATTRIBUTE_WITH_COMMENT);
         assertEquals("One element expected!", 1, elememts.size());
         ASTElement element = elememts.iterator().next();
         ASTElExpression elExpr = element.getFirstDescendantOfType(ASTElExpression.class);
@@ -166,7 +172,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testELInTagValueWithCommentSQ() {
-        List<ASTElement> elememts = vf.getNodes(ASTElement.class, TEST_EL_IN_TAG_ATTRIBUTE_WITH_COMMENT_SQ);
+        Set<ASTElement> elememts = getNodes(ASTElement.class, TEST_EL_IN_TAG_ATTRIBUTE_WITH_COMMENT_SQ);
         assertEquals("One element expected!", 1, elememts.size());
         ASTElement element = elememts.iterator().next();
         ASTElExpression elExpr = element.getFirstDescendantOfType(ASTElExpression.class);
@@ -180,7 +186,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testELInHtmlScript() {
-        List<ASTHtmlScript> scripts = vf.getNodes(ASTHtmlScript.class, TEST_EL_IN_HTML_SCRIPT);
+        Set<ASTHtmlScript> scripts = getNodes(ASTHtmlScript.class, TEST_EL_IN_HTML_SCRIPT);
         assertEquals("One script expected!", 1, scripts.size());
         ASTHtmlScript script = scripts.iterator().next();
         ASTText text = script.getFirstChildOfType(ASTText.class);
@@ -195,7 +201,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testInlineCommentInEL() {
-        List<ASTHtmlScript> scripts = vf.getNodes(ASTHtmlScript.class, TEST_EL_IN_HTML_SCRIPT_WITH_COMMENT);
+        Set<ASTHtmlScript> scripts = getNodes(ASTHtmlScript.class, TEST_EL_IN_HTML_SCRIPT_WITH_COMMENT);
         assertEquals("One script expected!", 1, scripts.size());
         ASTHtmlScript script = scripts.iterator().next();
         ASTText text = script.getFirstChildOfType(ASTText.class);
@@ -210,7 +216,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testQuotedELInHtmlScript() {
-        List<ASTHtmlScript> scripts = vf.getNodes(ASTHtmlScript.class, TEST_QUOTED_EL_IN_HTML_SCRIPT);
+        Set<ASTHtmlScript> scripts = getNodes(ASTHtmlScript.class, TEST_QUOTED_EL_IN_HTML_SCRIPT);
         assertEquals("One script expected!", 1, scripts.size());
         ASTHtmlScript script = scripts.iterator().next();
         ASTText text = script.getFirstChildOfType(ASTText.class);
@@ -226,7 +232,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testImportHtmlScript() {
-        List<ASTHtmlScript> scripts = vf.getNodes(ASTHtmlScript.class, TEST_IMPORT_JAVASCRIPT);
+        Set<ASTHtmlScript> scripts = getNodes(ASTHtmlScript.class, TEST_IMPORT_JAVASCRIPT);
         assertEquals("One script expected!", 1, scripts.size());
         ASTHtmlScript script = scripts.iterator().next();
         List<ASTAttribute> attr = script.findDescendantsOfType(ASTAttribute.class);
@@ -242,13 +248,13 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testHtmlScriptWithAttribute() {
-        List<ASTHtmlScript> scripts = vf.getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT_WITH_ATTRIBUTE);
+        Set<ASTHtmlScript> scripts = getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT_WITH_ATTRIBUTE);
         assertEquals("One script expected!", 1, scripts.size());
         ASTHtmlScript script = scripts.iterator().next();
         ASTText text = script.getFirstChildOfType(ASTText.class);
         assertEquals("Correct script content expected!", "Script!", text.getImage());
         List<ASTText> attrs = script.findDescendantsOfType(ASTText.class);
-        assertEquals("text/javascript", attrs.get(0).getImage());
+        assertTrue("text/javascript".equals(attrs.get(0).getImage()));
     }
 
     /**
@@ -256,7 +262,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testComplexHtmlScript() {
-        List<ASTHtmlScript> script = vf.getNodes(ASTHtmlScript.class, TEST_COMPLEX_SCRIPT);
+        Set<ASTHtmlScript> script = getNodes(ASTHtmlScript.class, TEST_COMPLEX_SCRIPT);
         assertEquals("One script expected!", 1, script.size());
         ASTHtmlScript next = script.iterator().next();
         ASTText text = next.getFirstChildOfType(ASTText.class);
@@ -269,7 +275,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testInlineCss() {
-        List<ASTElement> elements = vf.getNodes(ASTElement.class, TEST_INLINE_STYLE);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_INLINE_STYLE);
         assertEquals("Two elements expected!", 3, elements.size());
     }
 
@@ -278,7 +284,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testTextInTag() {
-        List<ASTText> scripts = vf.getNodes(ASTText.class, TEST_TEXT_IN_TAG);
+        Set<ASTText> scripts = getNodes(ASTText.class, TEST_TEXT_IN_TAG);
         assertEquals("One text chunk expected!", 1, scripts.size());
         ASTText script = scripts.iterator().next();
         assertEquals("Correct content expected!", " some text ", script.getImage());
@@ -290,9 +296,10 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void noSpacesBetweenTags() {
-        List<ASTElement> scripts = vf.getNodes(ASTElement.class, TEST_TAGS_NO_SPACE);
+        Set<ASTElement> scripts = getNodes(ASTElement.class, TEST_TAGS_NO_SPACE);
         assertEquals("Two tags expected!", 2, scripts.size());
-        Iterator<ASTElement> iterator = scripts.iterator();
+        List<ASTElement> elmts = sortNodesByName(scripts);
+        Iterator<ASTElement> iterator = elmts.iterator();
         ASTElement script = iterator.next();
         assertEquals("Correct content expected!", "a", script.getName());
         script = iterator.next();
@@ -305,7 +312,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void unclosedTagsWithDollar() {
-        List<ASTText> scripts = vf.getNodes(ASTText.class, TEST_TAGS_WITH_DOLLAR);
+        Set<ASTText> scripts = getNodes(ASTText.class, TEST_TAGS_WITH_DOLLAR);
         assertEquals("Two text chunks expected!", 2, scripts.size());
         ASTText script = scripts.iterator().next();
         assertEquals("Correct content expected!", " $ ", script.getImage());
@@ -317,7 +324,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void unclosedTagsWithELWithin() {
-        List<ASTElement> element = vf.getNodes(ASTElement.class, TEST_TAGS_WITH_EL_WITHIN);
+        Set<ASTElement> element = getNodes(ASTElement.class, TEST_TAGS_WITH_EL_WITHIN);
         assertEquals("One element expected!", 1, element.size());
 
         for (ASTElement elem : element) {
@@ -340,20 +347,21 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void textAfterOpenAndClosedTag() {
-        List<ASTElement> nodes = vf.getNodes(ASTElement.class, TEST_TEXT_AFTER_OPEN_AND_CLOSED_TAG);
+        Set<ASTElement> nodes = getNodes(ASTElement.class, TEST_TEXT_AFTER_OPEN_AND_CLOSED_TAG);
         assertEquals("Two elements expected!", 2, nodes.size());
-        assertEquals("First element should be a", "a", nodes.get(0).getName());
-        assertFalse("first element should be closed", nodes.get(0).isUnclosed());
-        assertEquals("Second element should be b", "b", nodes.get(1).getName());
-        assertTrue("Second element should not be closed", nodes.get(1).isUnclosed());
+        List<ASTElement> elmts = sortNodesByName(nodes);
+        assertEquals("First element should be a", "a", elmts.get(0).getName());
+        assertFalse("first element should be closed", elmts.get(0).isUnclosed());
+        assertEquals("Second element should be b", "b", elmts.get(1).getName());
+        assertTrue("Second element should not be closed", elmts.get(1).isUnclosed());
 
-        List<ASTText> text = vf.getNodes(ASTText.class, TEST_TEXT_AFTER_OPEN_AND_CLOSED_TAG);
+        Set<ASTText> text = getNodes(ASTText.class, TEST_TEXT_AFTER_OPEN_AND_CLOSED_TAG);
         assertEquals("Two text chunks expected!", 2, text.size());
     }
 
     @Test
     public void quoteEL() {
-        List<ASTAttributeValue> attributes = vf.getNodes(ASTAttributeValue.class, TEST_QUOTE_EL);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_QUOTE_EL);
         assertEquals("One attribute expected!", 1, attributes.size());
         ASTAttributeValue attr = attributes.iterator().next();
         List<ASTElExpression> els = attr.findChildrenOfType(ASTElExpression.class);
@@ -368,7 +376,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void quoteAttrValue() {
-        List<ASTAttributeValue> attributes = vf.getNodes(ASTAttributeValue.class, TEST_ATTR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_ATTR);
         assertEquals("One attribute expected!", 1, attributes.size());
         ASTAttributeValue attr = attributes.iterator().next();
         ASTText text = attr.getFirstChildOfType(ASTText.class);
@@ -380,7 +388,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void noQuoteAttrEmpty() {
-        List<ASTAttributeValue> attributes = vf.getNodes(ASTAttributeValue.class, TEST_EMPTY_ATTR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_EMPTY_ATTR);
         assertEquals("two attributes expected!", 2, attributes.size());
         Iterator<ASTAttributeValue> iterator = attributes.iterator();
         ASTAttributeValue attr = iterator.next();
@@ -389,7 +397,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
             // in order to ensure that we check the proper attribute
             attr = iterator.next();
         }
-        assertNull("Expected to detect proper value for attribute!", attr.getImage());
+        assertEquals("Expected to detect proper value for attribute!", null, attr.getImage());
     }
 
     /**
@@ -397,7 +405,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void singleQuoteAttrTab() {
-        List<ASTAttributeValue> attributes = vf.getNodes(ASTAttributeValue.class, TEST_TAB_ATTR);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_TAB_ATTR);
         assertEquals("One attribute expected!", 1, attributes.size());
         Iterator<ASTAttributeValue> iterator = attributes.iterator();
         ASTAttributeValue attr = iterator.next();
@@ -408,33 +416,35 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
 
     @Test
     public void unclosedTag() {
-        List<ASTElement> elements = vf.getNodes(ASTElement.class, TEST_UNCLOSED_SIMPLE);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_SIMPLE);
+        List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("2 tags expected", 2, elements.size());
-        assertEquals("Second element should be tag:someTag", "tag:someTag", elements.get(0).getName());
-        assertEquals("First element should be sorted tag:if", "tag:if", elements.get(1).getName());
+        assertEquals("First element should be sorted tag:if", "tag:if", sortedElmnts.get(0).getName());
+        assertEquals("Second element should be tag:someTag", "tag:someTag", sortedElmnts.get(1).getName());
 
-        assertTrue(elements.get(1).isEmpty());
-        assertTrue(elements.get(1).isUnclosed());
-        assertFalse(elements.get(0).isEmpty());
-        assertFalse(elements.get(0).isUnclosed());
+        assertTrue(sortedElmnts.get(0).isEmpty());
+        assertTrue(sortedElmnts.get(0).isUnclosed());
+        assertFalse(sortedElmnts.get(1).isEmpty());
+        assertFalse(sortedElmnts.get(1).isUnclosed());
     }
 
     @Test
     public void unclosedTagAndNoQuotesForAttribute() {
-        List<ASTElement> elements = vf.getNodes(ASTElement.class, TEST_UNCLOSED_ATTR);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_ATTR);
+        List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("2 tags expected", 2, elements.size());
-        assertEquals("Second element should be tag:someTag", "tag:someTag", elements.get(0).getName());
-        assertEquals("First element should be sorted tag:if", "tag:if", elements.get(1).getName());
+        assertEquals("First element should be sorted tag:if", "tag:if", sortedElmnts.get(0).getName());
+        assertEquals("Second element should be tag:someTag", "tag:someTag", sortedElmnts.get(1).getName());
 
-        assertTrue(elements.get(1).isEmpty());
-        assertTrue(elements.get(1).isUnclosed());
-        assertFalse(elements.get(0).isEmpty());
-        assertFalse(elements.get(0).isUnclosed());
+        assertTrue(sortedElmnts.get(0).isEmpty());
+        assertTrue(sortedElmnts.get(0).isUnclosed());
+        assertFalse(sortedElmnts.get(1).isEmpty());
+        assertFalse(sortedElmnts.get(1).isUnclosed());
     }
 
     @Test
     public void unclosedTagMultipleLevels() {
-        List<ASTElement> elements = vf.getNodes(ASTElement.class, TEST_UNCLOSED_MULTIPLE_LEVELS);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_MULTIPLE_LEVELS);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("3 tags expected", 3, elements.size());
         assertEquals("First element should be sorted tag:someTag", "tag:someTag", sortedElmnts.get(0).getName());
@@ -456,7 +466,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void nestedEmptyTags() {
-        List<ASTElement> elements = vf.getNodes(ASTElement.class, TEST_MULTIPLE_EMPTY_TAGS);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_MULTIPLE_EMPTY_TAGS);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("4 tags expected", 4, elements.size());
         assertEquals("First element should a1", "a1", sortedElmnts.get(0).getName());
@@ -488,7 +498,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void nestedMultipleTags() {
-        List<ASTElement> elements = vf.getNodes(ASTElement.class, TEST_MULTIPLE_NESTED_TAGS);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_MULTIPLE_NESTED_TAGS);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("4 tags expected", 6, elements.size());
         assertEquals("First element should a1", "a1", sortedElmnts.get(0).getName());
@@ -531,7 +541,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void unclosedParentTagClosedBeforeChild() {
-        List<ASTElement> elements = vf.getNodes(ASTElement.class, TEST_UNCLOSED_END_AFTER_PARENT_CLOSE);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_END_AFTER_PARENT_CLOSE);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("4 tags expected", 4, elements.size());
         assertEquals("First element should be 'a'", "a", sortedElmnts.get(0).getName());
@@ -565,7 +575,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void unmatchedTagDoesNotInfluenceStructure() {
-        List<ASTElement> elements = vf.getNodes(ASTElement.class, TEST_UNCLOSED_UNMATCHED_CLOSING_TAG);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_UNMATCHED_CLOSING_TAG);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("4 tags expected", 4, elements.size());
         assertEquals("First element should be 'a'", "a", sortedElmnts.get(0).getName());
@@ -599,7 +609,7 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void unclosedStartTagWithUnmatchedCloseOfDifferentTag() {
-        List<ASTElement> elements = vf.getNodes(ASTElement.class, TEST_UNCLOSED_START_TAG_WITH_UNMATCHED_CLOSE);
+        Set<ASTElement> elements = getNodes(ASTElement.class, TEST_UNCLOSED_START_TAG_WITH_UNMATCHED_CLOSE);
         List<ASTElement> sortedElmnts = sortNodesByName(elements);
         assertEquals("5 tags expected", 5, elements.size());
         assertEquals("First element should be 'a'", "a", sortedElmnts.get(0).getName());
@@ -634,13 +644,14 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
      * is the same it will sort against o1.getBeginColumn() +""+
      * o1.getBeginLine(). so first criteria is the name, then the second is the
      * column +""+line string.
-     *
+     * 
      * @param elements
      * @return
      */
-    private List<ASTElement> sortNodesByName(List<ASTElement> elements) {
-        Collections.sort(elements, new Comparator<ASTElement>() {
-            @Override
+    private List<ASTElement> sortNodesByName(Set<ASTElement> elements) {
+        List<ASTElement> list = new ArrayList<>();
+        list.addAll(elements);
+        Collections.sort(list, new Comparator<ASTElement>() {
             public int compare(ASTElement o1, ASTElement o2) {
                 if (o1.getName() == null) {
                     return Integer.MIN_VALUE;
@@ -656,12 +667,12 @@ public class VfDocStyleTest extends AbstractVfNodesTest {
                 return o1.getName().compareTo(o2.getName());
             }
         });
-        return elements;
+        return list;
     }
 
     @Test
     public void noQuoteAttrWithJspEL() {
-        List<ASTAttributeValue> attributes = vf.getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_EL);
+        Set<ASTAttributeValue> attributes = getNodes(ASTAttributeValue.class, TEST_NO_QUOTE_ATTR_WITH_EL);
         assertEquals("One attribute expected!", 1, attributes.size());
         Iterator<ASTAttributeValue> iterator = attributes.iterator();
         ASTAttributeValue attr = iterator.next();
diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfPageStyleTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfPageStyleTest.java
index 77287f6e42..9295a8945d 100644
--- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfPageStyleTest.java
+++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfPageStyleTest.java
@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.vf.ast;
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.List;
+import java.util.Set;
 
 import org.junit.Test;
 
@@ -17,7 +17,7 @@ public class VfPageStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testElExpression() {
-        List<ASTElExpression> expressions = vf.getNodes(ASTElExpression.class, VF_EL_EXPRESSION);
+        Set<ASTElExpression> expressions = getNodes(ASTElExpression.class, VF_EL_EXPRESSION);
         assertEquals("One expression expected!", 1, expressions.size());
         ASTElExpression expression = expressions.iterator().next();
         ASTExpression exp = expression.getFirstChildOfType(ASTExpression.class);
@@ -25,7 +25,7 @@ public class VfPageStyleTest extends AbstractVfNodesTest {
         assertEquals("Correct expression content expected!", "myBean", id.getImage());
         ASTDotExpression dot = exp.getFirstChildOfType(ASTDotExpression.class);
         ASTIdentifier dotid = dot.getFirstChildOfType(ASTIdentifier.class);
-        assertEquals("Correct expression content expected!", "get", dotid.getImage());
+        assertEquals("Correct expression content expected!", "get", dotid.getImage()); 
         ASTArguments arguments = exp.getFirstChildOfType(ASTArguments.class);
         ASTExpression innerExpression = arguments.getFirstChildOfType(ASTExpression.class);
         ASTLiteral literal = innerExpression.getFirstChildOfType(ASTLiteral.class);
@@ -37,7 +37,7 @@ public class VfPageStyleTest extends AbstractVfNodesTest {
      */
     @Test
     public void testElExpressionInAttribute() {
-        List<ASTElExpression> expressions = vf.getNodes(ASTElExpression.class, VF_EL_EXPRESSION_IN_ATTRIBUTE);
+        Set<ASTElExpression> expressions = getNodes(ASTElExpression.class, VF_EL_EXPRESSION_IN_ATTRIBUTE);
         assertEquals("One expression expected!", 1, expressions.size());
         ASTElExpression expression = expressions.iterator().next();
         ASTExpression exp = expression.getFirstChildOfType(ASTExpression.class);
diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfParserTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfParserTest.java
deleted file mode 100644
index f425470314..0000000000
--- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfParserTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.vf.ast;
-
-import org.junit.Test;
-
-/**
- * @author sergey.gorbaty
- */
-public class VfParserTest extends AbstractVfNodesTest {
-
-    @Test
-    public void testSingleDoubleQuoteAndEL() {
-        vf.parse("<span escape='false' attrib=\"{!call}\">${!'yes'}</span>");
-    }
-
-    @Test
-    public void testSingleDoubleQuoteAndELFunction() {
-        vf.parse("<span escape='false' attrib=\"{!call}\">${!method}</span>");
-    }
-
-    @Test
-    public void testSingleDoubleQuote() {
-        vf.parse("<span escape='false' attrib=\"{!call}\">${\"yes\"}</span>");
-    }
-
-}
diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfParsingHelper.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfParsingHelper.java
deleted file mode 100644
index bcb97098f5..0000000000
--- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/ast/VfParsingHelper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.vf.ast;
-
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
-import net.sourceforge.pmd.lang.vf.VfLanguageModule;
-
-public final class VfParsingHelper extends BaseParsingHelper<VfParsingHelper, ASTCompilationUnit> {
-
-    public static final VfParsingHelper DEFAULT = new VfParsingHelper(Params.getDefaultProcess());
-
-    private VfParsingHelper(Params params) {
-        super(VfLanguageModule.NAME, ASTCompilationUnit.class, params);
-    }
-
-    @Override
-    protected VfParsingHelper clone(Params params) {
-        return new VfParsingHelper(params);
-    }
-}
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index 53b81d8624..f9883ffe40 100644
--- a/pmd-xml/pom.xml
+++ b/pmd-xml/pom.xml
@@ -55,20 +55,10 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-lang-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserOptionsTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserOptionsTest.java
index f9c9f2529c..2e07a3e966 100644
--- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserOptionsTest.java
+++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserOptionsTest.java
@@ -19,7 +19,7 @@ import net.sourceforge.pmd.properties.BooleanProperty;
 public class XmlParserOptionsTest {
 
     @Test
-    public void testDefaults() {
+    public void testDefaults() throws Exception {
         XmlParserOptions options = new XmlParserOptions();
         assertFalse(options.isCoalescing());
         assertTrue(options.isExpandEntityReferences());
@@ -41,7 +41,7 @@ public class XmlParserOptionsTest {
     }
 
     @Test
-    public void testConstructor() {
+    public void testConstructor() throws Exception {
         MyRule rule = new MyRule();
 
         rule.setProperty(XmlParserOptions.COALESCING_DESCRIPTOR, true);
diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserTest.java
index 6499c491f4..6b0bde3e3d 100644
--- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserTest.java
+++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserTest.java
@@ -4,15 +4,17 @@
 
 package net.sourceforge.pmd.lang.xml;
 
-import static net.sourceforge.pmd.lang.xml.XmlParsingHelper.XML;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.Locale;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -49,11 +51,16 @@ public class XmlParserTest {
     /**
      * See bug #1054: XML Rules ever report a line -1 and not the line/column
      * where the error occurs
-     *
+     * 
+     * @throws Exception
+     *             any error
      */
     @Test
-    public void testLineNumbers() {
-        Node document = XML.parse(XML_TEST);
+    public void testLineNumbers() throws Exception {
+        LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
+        Parser parser = xmlVersionHandler.getParser(xmlVersionHandler.getDefaultParserOptions());
+        Node document = parser.parse(null, new StringReader(XML_TEST));
 
         assertNode(document, "document", 2);
         assertLineNumbers(document, 1, 1, 19, 14);
@@ -94,7 +101,10 @@ public class XmlParserTest {
      */
     @Test
     public void testDefaultParsing() {
-        Node document = XML.parse(XML_TEST);
+        LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
+        Parser parser = xmlVersionHandler.getParser(xmlVersionHandler.getDefaultParserOptions());
+        Node document = parser.parse(null, new StringReader(XML_TEST));
 
         assertNode(document, "document", 2);
         Node dtdElement = document.jjtGetChild(0);
@@ -121,9 +131,12 @@ public class XmlParserTest {
      */
     @Test
     public void testParsingCoalescingEnabled() {
+        LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
         XmlParserOptions parserOptions = new XmlParserOptions();
         parserOptions.setCoalescing(true);
-        Node document = XML.withParserOptions(parserOptions).parse(XML_TEST);
+        Parser parser = xmlVersionHandler.getParser(parserOptions);
+        Node document = parser.parse(null, new StringReader(XML_TEST));
 
         assertNode(document, "document", 2);
         Node dtdElement = document.jjtGetChild(0);
@@ -149,9 +162,12 @@ public class XmlParserTest {
      */
     @Test
     public void testParsingDoNotExpandEntities() {
+        LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
         XmlParserOptions parserOptions = new XmlParserOptions();
         parserOptions.setExpandEntityReferences(false);
-        Node document = XML.withParserOptions(parserOptions).parse(XML_TEST);
+        Parser parser = xmlVersionHandler.getParser(parserOptions);
+        Node document = parser.parse(null, new StringReader(XML_TEST));
 
         assertNode(document, "document", 2);
         Node dtdElement = document.jjtGetChild(0);
@@ -188,9 +204,12 @@ public class XmlParserTest {
      */
     @Test
     public void testParsingIgnoreComments() {
+        LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
         XmlParserOptions parserOptions = new XmlParserOptions();
         parserOptions.setIgnoringComments(true);
-        Node document = XML.withParserOptions(parserOptions).parse(XML_TEST);
+        Parser parser = xmlVersionHandler.getParser(parserOptions);
+        Node document = parser.parse(null, new StringReader(XML_TEST));
 
         assertNode(document, "document", 2);
         Node dtdElement = document.jjtGetChild(0);
@@ -216,9 +235,12 @@ public class XmlParserTest {
      */
     @Test
     public void testParsingIgnoreElementContentWhitespace() {
+        LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
         XmlParserOptions parserOptions = new XmlParserOptions();
         parserOptions.setIgnoringElementContentWhitespace(true);
-        Node document = XML.withParserOptions(parserOptions).parse(XML_TEST);
+        Parser parser = xmlVersionHandler.getParser(parserOptions);
+        Node document = parser.parse(null, new StringReader(XML_TEST));
 
         assertNode(document, "document", 2);
         Node dtdElement = document.jjtGetChild(0);
@@ -241,7 +263,10 @@ public class XmlParserTest {
      */
     @Test
     public void testDefaultParsingNamespaces() {
-        Node document = XML.parse(XML_NAMESPACE_TEST);
+        LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
+        Parser parser = xmlVersionHandler.getParser(xmlVersionHandler.getDefaultParserOptions());
+        Node document = parser.parse(null, new StringReader(XML_NAMESPACE_TEST));
 
         assertNode(document, "document", 1);
         Node rootElement = document.jjtGetChild(0);
@@ -271,9 +296,12 @@ public class XmlParserTest {
      */
     @Test
     public void testParsingNotNamespaceAware() {
+        LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
         XmlParserOptions parserOptions = new XmlParserOptions();
         parserOptions.setNamespaceAware(false);
-        Node document = XML.withParserOptions(parserOptions).parse(XML_NAMESPACE_TEST);
+        Parser parser = xmlVersionHandler.getParser(parserOptions);
+        Node document = parser.parse(null, new StringReader(XML_NAMESPACE_TEST));
 
         assertNode(document, "document", 1);
         Node rootElement = document.jjtGetChild(0);
@@ -299,21 +327,24 @@ public class XmlParserTest {
 
     /**
      * Verifies the parsing behavior of the XML parser with validation on.
-     *
+     * 
      * @throws UnsupportedEncodingException
      *             error
      */
     @Test
     public void testParsingWithValidation() throws UnsupportedEncodingException {
+        LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME)
+                .getDefaultVersion().getLanguageVersionHandler();
         XmlParserOptions parserOptions = new XmlParserOptions();
         parserOptions.setValidating(true);
+        Parser parser = xmlVersionHandler.getParser(parserOptions);
         PrintStream oldErr = System.err;
         Locale oldLocale = Locale.getDefault();
         try {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
             System.setErr(new PrintStream(bos));
             Locale.setDefault(Locale.ENGLISH);
-            Node document = XML.withParserOptions(parserOptions).parse(XML_INVALID_WITH_DTD);
+            Node document = parser.parse(null, new StringReader(XML_INVALID_WITH_DTD));
             Assert.assertNotNull(document);
             String output = bos.toString("UTF-8");
             Assert.assertTrue(output.contains("Element type \"invalidChild\" must be declared."));
@@ -340,20 +371,30 @@ public class XmlParserTest {
         assertLineNumbers(document.jjtGetChild(0), 1, 22, 1, 29);
     }
 
+    private Node parseXml(String xml) {
+        LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME).getDefaultVersion().getLanguageVersionHandler();
+        XmlParserOptions options = (XmlParserOptions) xmlVersionHandler.getDefaultParserOptions();
+        Parser parser = xmlVersionHandler.getParser(options);
+        return parser.parse(null, new StringReader(xml));
+    }
+
     @Test
     public void testBug1518() throws Exception {
-        XML.parseResource("parsertests/bug1518.xml");
+        String xml = IOUtils.toString(XmlParserTest.class.getResourceAsStream("parsertests/bug1518.xml"),
+                StandardCharsets.UTF_8);
+        Node document = parseXml(xml);
+        assertNotNull(document);
     }
 
     @Test
     public void testAutoclosingElementLength() {
         final String xml = "<elementName att1='foo' att2='bar' att3='other' />";
-        assertLineNumbers(XML.parse(xml), 1, 1, 1, xml.length());
+        assertLineNumbers(parseXml(xml), 1, 1, 1, xml.length());
     }
 
     /**
      * Asserts a single node inclusive attributes.
-     *
+     * 
      * @param node
      *            the node
      * @param toString
@@ -383,7 +424,7 @@ public class XmlParserTest {
 
     /**
      * Assert a single text node.
-     *
+     * 
      * @param node
      *            the node to check
      * @param text
diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParsingHelper.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParsingHelper.java
deleted file mode 100644
index 96f679b8f1..0000000000
--- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParsingHelper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.xml;
-
-import org.jetbrains.annotations.NotNull;
-
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
-import net.sourceforge.pmd.lang.pom.PomLanguageModule;
-import net.sourceforge.pmd.lang.wsdl.WsdlLanguageModule;
-import net.sourceforge.pmd.lang.xml.ast.XmlParser.RootXmlNode;
-
-/**
- * @author Clément Fournier
- */
-public final class XmlParsingHelper extends BaseParsingHelper<XmlParsingHelper, RootXmlNode> {
-
-    public static final XmlParsingHelper XML = new XmlParsingHelper(XmlLanguageModule.NAME, Params.getDefaultProcess());
-    public static final XmlParsingHelper WSDL = new XmlParsingHelper(WsdlLanguageModule.NAME, Params.getDefaultProcess());
-    public static final XmlParsingHelper POM = new XmlParsingHelper(PomLanguageModule.NAME, Params.getDefaultProcess());
-
-
-    private XmlParsingHelper(@NotNull String langName, @NotNull Params params) {
-        super(langName, RootXmlNode.class, params);
-    }
-
-    @NotNull
-    @Override
-    protected XmlParsingHelper clone(@NotNull Params params) {
-        return new XmlParsingHelper(this.getLangName(), params);
-    }
-}