Updated the tests to reach a higher code coverage and also to fix a bug when generating code coverage