Test coverage machinery. Works for me.
Merge pull request #527 from afred/coverage-522

Test coverage machinery. Works for me.