Issue #45, Issue #41 more unit tests