Added code coverage analysis. More driver code cleanup.