Issue #20: A few more unit tests