Updated to include code coverage.