v4.0.4: Fix test coverage