Correction for Issue #2 (and more unit tests)