[bugfix] Some fixes for self:: axis. Tests updated.
[ignore] Fixed failing xinclude test case.