Tests code coverage improved
Merge branch 'master' into coverage