Issue #20: More unit tests