Revert "Fixed gaps in test coverage"

This reverts commit 007038d6c07cfd6745523d0125e1460e87bac8f9.