Issue #11. Updated the tests.