More complete xinclude implementation and tests