Merge pull request #581 from lburgazzoli/github-543

Add tests for #543