diff --git a/packages/calcite-components/src/components/chip-group/chip-group.e2e.ts b/packages/calcite-components/src/components/chip-group/chip-group.e2e.ts
index 228904ca1d3..0349ca0640e 100644
--- a/packages/calcite-components/src/components/chip-group/chip-group.e2e.ts
+++ b/packages/calcite-components/src/components/chip-group/chip-group.e2e.ts
@@ -520,7 +520,7 @@ describe("calcite-chip-group", () => {
expect(chipSelectSpy1).toHaveReceivedEventTimes(0);
expect(chipSelectSpy2).toHaveReceivedEventTimes(0);
- await chip5.setAttribute("selected", true);
+ await chip5.toggleAttribute("selected", true);
await page.waitForChanges();
expect(chipGroupSelectSpy).toHaveReceivedEventTimes(0);
expect(chipSelectSpy1).toHaveReceivedEventTimes(0);
@@ -569,7 +569,7 @@ describe("calcite-chip-group", () => {
expect(await element.getProperty("selectedItems")).toHaveLength(0);
await selectedItemAsserter([]);
- chip5.setAttribute("selected", true);
+ chip5.toggleAttribute("selected", true);
await page.waitForChanges();
expect(chipGroupSelectSpy).toHaveReceivedEventTimes(0);
expect(chipSelectSpy1).toHaveReceivedEventTimes(0);
@@ -577,7 +577,7 @@ describe("calcite-chip-group", () => {
expect(await element.getProperty("selectedItems")).toHaveLength(1);
await selectedItemAsserter([chip5.id]);
- chip4.setAttribute("selected", true);
+ chip4.toggleAttribute("selected", true);
await page.waitForChanges();
expect(chipGroupSelectSpy).toHaveReceivedEventTimes(0);
expect(chipSelectSpy1).toHaveReceivedEventTimes(0);
@@ -617,7 +617,7 @@ describe("calcite-chip-group", () => {
expect(chipSelectSpy1).toHaveReceivedEventTimes(0);
expect(chipSelectSpy2).toHaveReceivedEventTimes(0);
- chip5.setAttribute("selected", true);
+ chip5.toggleAttribute("selected", true);
await page.waitForChanges();
expect(chipGroupSelectSpy).toHaveReceivedEventTimes(0);
expect(chipSelectSpy1).toHaveReceivedEventTimes(0);
diff --git a/packages/calcite-components/src/components/chip/chip.e2e.ts b/packages/calcite-components/src/components/chip/chip.e2e.ts
index 5288e6183da..4035db3dd65 100644
--- a/packages/calcite-components/src/components/chip/chip.e2e.ts
+++ b/packages/calcite-components/src/components/chip/chip.e2e.ts
@@ -214,7 +214,7 @@ describe("calcite-chip", () => {
await page.setContent(`
${chipSnippet}
`);
const chipEl = await page.find(`calcite-chip`);
- chipEl.setAttribute("closed", true);
+ chipEl.toggleAttribute("closed", true);
await page.waitForChanges();
expect(await chipEl.isVisible()).toBe(false);
diff --git a/packages/calcite-components/src/components/combobox/combobox.e2e.ts b/packages/calcite-components/src/components/combobox/combobox.e2e.ts
index 1ea369f9674..eec01ad1e14 100644
--- a/packages/calcite-components/src/components/combobox/combobox.e2e.ts
+++ b/packages/calcite-components/src/components/combobox/combobox.e2e.ts
@@ -1632,7 +1632,7 @@ describe("calcite-combobox", () => {
let element: E2EElement;
let comboboxItem: E2EElement;
let itemNestedLi: E2EElement;
- let closeEvent: Promise;
+ let closeEvent: Promise;
beforeEach(async () => {
page = await newE2EPage();
diff --git a/packages/calcite-components/src/components/functional/XButton.tsx b/packages/calcite-components/src/components/functional/XButton.tsx
index ef331fc6ed4..1263a8020ea 100644
--- a/packages/calcite-components/src/components/functional/XButton.tsx
+++ b/packages/calcite-components/src/components/functional/XButton.tsx
@@ -18,8 +18,6 @@ export const XButton: FunctionalComponent = ({
disabled,
key,
label,
- onClick,
- ref,
scale,
}): VNode => (