Improve test coverage

This PR is mainly about improving coverage on some components.

I also identified a tiny bug in adapter calls counting which I fixed.