Improved tests code coverage