I no longer think that coverage is racy, but I guess we will see in the long run.
reworked some tests.