Fix issue #7 by adding extra tests.