Issue #9 Fixing test