diff --git a/src/components/internal-components/InternalShadowRoundButton/InternalShadowRoundButton.tsx b/src/components/internal-components/InternalShadowRoundButton/InternalShadowRoundButton.tsx
index 41c4b52cf..7489cb1ab 100644
--- a/src/components/internal-components/InternalShadowRoundButton/InternalShadowRoundButton.tsx
+++ b/src/components/internal-components/InternalShadowRoundButton/InternalShadowRoundButton.tsx
@@ -159,18 +159,16 @@ export const InternalShadowRoundButton = <C extends ElementType = "button">(
     ...rest
   } = props;
 
+  const iconColorFilter = disabled
+    ? disabledIconColor
+    : defaultIconColor ?? null;
+
   const icon = iconName && (
     <OakIcon
       iconName={iconName}
       $width={iconSize}
       $height={iconSize}
-      $colorFilter={
-        props.disabled
-          ? disabledIconColor
-          : defaultIconColor
-            ? defaultIconColor
-            : null
-      }
+      $colorFilter={iconColorFilter}
       data-icon-for="button"
     />
   );
diff --git a/src/components/messaging-and-feedback/OakModalCenter/OakModalCenter.test.tsx b/src/components/messaging-and-feedback/OakModalCenter/OakModalCenter.test.tsx
index bb2fc8c03..052705d86 100644
--- a/src/components/messaging-and-feedback/OakModalCenter/OakModalCenter.test.tsx
+++ b/src/components/messaging-and-feedback/OakModalCenter/OakModalCenter.test.tsx
@@ -53,13 +53,13 @@ describe(OakModalCenter, () => {
   it("hides close button when hideCloseButton is true", () => {
     const onCloseSpy = jest.fn();
 
-    const { queryAllByTestId } = renderWithTheme(
+    const { queryByTestId } = renderWithTheme(
       <OakModalCenter isOpen onClose={onCloseSpy} hideCloseButton={true}>
         Modal content
       </OakModalCenter>,
     );
 
-    expect(queryAllByTestId("close-button")).toBeNull;
+    expect(queryByTestId("close-button")).toBeNull();
   });
 
   it("calls onClose when the backdrop is clicked", () => {
diff --git a/src/components/owa/OakCodeRenderer/OakCodeRenderer.test.tsx b/src/components/owa/OakCodeRenderer/OakCodeRenderer.test.tsx
index 25de9a461..054f90404 100644
--- a/src/components/owa/OakCodeRenderer/OakCodeRenderer.test.tsx
+++ b/src/components/owa/OakCodeRenderer/OakCodeRenderer.test.tsx
@@ -20,7 +20,7 @@ describe("OakCodeRenderer", () => {
     const { getByText } = renderWithTheme(
       <OakCodeRenderer string={mockString} />,
     );
-    expect(getByText("output")).toBeInTheDocument;
+    expect(getByText("output")).toBeInTheDocument();
   });
 
   it("matches snapshot", () => {
diff --git a/src/components/owa/pupil/lesson/OakLessonNavItem/OakLessonNavItem.tsx b/src/components/owa/pupil/lesson/OakLessonNavItem/OakLessonNavItem.tsx
index 5538ec3be..a7473145c 100644
--- a/src/components/owa/pupil/lesson/OakLessonNavItem/OakLessonNavItem.tsx
+++ b/src/components/owa/pupil/lesson/OakLessonNavItem/OakLessonNavItem.tsx
@@ -156,12 +156,14 @@ export const OakLessonNavItem = <C extends ElementType = "a">(
     disabledBackgroundColor,
   ] = pickColorsForSection(lessonSectionName);
 
-  const resolvedBackgroundColor =
-    isDisabled && disabledBackgroundColor
-      ? disabledBackgroundColor
-      : progress === "not-started"
-        ? notStartedBackgroundColor
-        : backgroundColor;
+  let resolvedBackgroundColor;
+  if (isDisabled && disabledBackgroundColor) {
+    resolvedBackgroundColor = disabledBackgroundColor;
+  } else if (progress === "not-started") {
+    resolvedBackgroundColor = notStartedBackgroundColor;
+  } else {
+    resolvedBackgroundColor = backgroundColor;
+  }
 
   return (
     <StyledLessonNavItem
diff --git a/src/components/unstyled/UnstyledChevronAccordion/UnstyledChevronAccordion.tsx b/src/components/unstyled/UnstyledChevronAccordion/UnstyledChevronAccordion.tsx
index ff55b385b..5caff0207 100644
--- a/src/components/unstyled/UnstyledChevronAccordion/UnstyledChevronAccordion.tsx
+++ b/src/components/unstyled/UnstyledChevronAccordion/UnstyledChevronAccordion.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from "react";
+import React, { ReactNode, useMemo } from "react";
 import styled from "styled-components";
 
 import {
@@ -145,6 +145,22 @@ const Accordion = ({
   );
 };
 
+const ControlledAccordion = (
+  props: UnstyledChevronAccordionCommonProps &
+    UnstyledChevronAccordionControlledProps,
+) => {
+  const { isOpen, onOpenChange, ...accordionProps } = props;
+  const contextValue = useMemo(
+    () => ({ isOpen, setOpen: onOpenChange }),
+    [isOpen, onOpenChange],
+  );
+  return (
+    <accordionContext.Provider value={contextValue}>
+      <Accordion {...accordionProps} />
+    </accordionContext.Provider>
+  );
+};
+
 /**
  * - UnstyledChevronAccordion has a chevron icon that rotates when the accordion is open.
  * - Unlike InternalChevronAccordion, it has no border effects for hover or focus states.
@@ -158,12 +174,7 @@ export const UnstyledChevronAccordion = (
 ) => {
   // Is the accordion being used as a controlled component?
   if (props.isOpen !== undefined) {
-    const { isOpen, onOpenChange, ...accordionProps } = props;
-    return (
-      <accordionContext.Provider value={{ isOpen, setOpen: onOpenChange }}>
-        <Accordion {...accordionProps} />
-      </accordionContext.Provider>
-    );
+    return <ControlledAccordion {...props} />;
   }
 
   const { isInitiallyOpen = false, ...accordionProps } = props;