Fixes #24, add a simple extra test.

Change the test suite to reflect this new reality.