Better code coverage setup and code clean up.