rewritten couple of tests
some more test cleanup
Merge branch 'diff-refactoring' of https://github.com/twerszko/xmlunit-nsc into diff-refactoring