Per issue #5. Some more unit tests.