More coverage
Avoid null call to mocks