Merge pull request bgruening#789 from bernt-matthias/topic/diamond-ta…

…xtest

diamond: added tax test and test data correction

Merge pull request bgruening#381 from gianlucacorrado/master

fixed input description