Add tests for new parsing with xinclude
Merge branch 'xinclude' into aptivate

* xinclude:
  Add tests for new parsing with xinclude