Dev #21 fixes code coverage