Clean a bit the test coverage

See issue #19