Improved coverage testing.