Add tests
Fix issue with tests.

Also, fix #10.  I ran a `git bisect' to try and find the bug, but it
vanished by the time I finished the bisection.
Align with whitespace