Merge pull request #367 from adamretter/develop

Use Ivy for OpenId dependencies
[refactor] Modernise the XPathQuery test suite and enable previously
disabled tests that now pass
Fix naming of abstract tests base class so that it is also not detected
as a test