Improve a bit the test coverage and fix the (quality) build.