[DOSGI-229] Improve test coverage
9 files changed