Tests code coverage improved