Improved compatability with JAXP, added 2 testcase