Added @covers for code coverage and removed @merge from types.