Improve test coverage
|Target version:||Easy hacks|
We are still quite short on test coverage. This task is a generic one and it's goal is to get test coverage somewhere around 90%. Feel free to create a subtasks.