Merge "Add @covers for includes/shell/ tests"