#6 Added tests, updated .xml.dist