Another code coverage fixing attempt