Improve the code coverage