Changes with Cobertura

This reverts commit b15d6d7d18192b8bbdd7e1155fafa967d046330a.