DEP-37 mainly: QDOX version changes, improved tests detection