Unit/coverage fix2

Trying this again...