Improve coverage

Last unit tests that I will contribute. So we reach the 80% :tada: