Merge "Add @covers tags to miscellaneous tests"