Improve the tests coverage