Merge "Add @covers tags to media tests"