Bugfix: syntax error (no idea how this fixes it, but it's gone)
Bugfix: update test
Bugfix: be more verbose
Merge pull request #121 from till/bugfix/testsuite

Bugfix/testsuite