Patches code-coverage reporting; fix
Tweaks for better setup