Merge "Add @coversNothing in places where @covers does not apply"