Making the tests pass on issue #7