Andy Chu Go through the motions of coverage again.

Thinking about how to merge this back into the Oil repo.