Issue #181: Adding Unit Test