Improved code coverage (& added reporting thereof)