Per issue #7. More tests.