Add nicer support for coverage

Just to encourage people to use the coverage tool (and write tests).

Change-Id: Ie30f9143a91363461aaaee59e0f9521d264dcd3e
Merge "Add nicer support for coverage"