Merge "Add @covers tags for more tests"