Fixed type annotation
Added @covers annotations
Added @covers annotations