Added another test.
More test coverage.
Refactored a bit the tests.