Some undoing of coverage code.
Merge branch 'test' into dev