Fixed merge issues and added the cobertura code coverage