Fixes #1 by improving tests
Merge pull request #2 from DennisVis/test-improvements

Fixes #1 by improving tests