#502: add new tests
Merge pull request #505 from mimmi20/issue-502

Fixes #502: add new tests