Merge "Add some missing @covers tags"