Per issue #11. Some more tests.