diff --git a/apps/web/app/components/Settings.stories.tsx b/apps/web/app/components/Settings.stories.tsx
index cb1995d..5e6c28b 100644
--- a/apps/web/app/components/Settings.stories.tsx
+++ b/apps/web/app/components/Settings.stories.tsx
@@ -24,8 +24,8 @@ export const Default: Story = {
       name: 'Test User',
     },
     reminders: [
-      { id: '1', minutes: 5, type: 'webhook' },
-      { id: '2', minutes: 30, type: 'webhook' },
+      { id: '1', minutesBefore: 5, notificationType: 'webhook' },
+      { id: '2', minutesBefore: 30, notificationType: 'webhook' },
     ],
   },
 }
diff --git a/apps/web/app/components/UserInfo.test.tsx b/apps/web/app/components/UserInfo.test.tsx
index 2fa9770..7909c0e 100644
--- a/apps/web/app/components/UserInfo.test.tsx
+++ b/apps/web/app/components/UserInfo.test.tsx
@@ -24,8 +24,8 @@ describe('UserInfo', () => {
     const user = {
       email: 'test@example.com',
     }
-    const { container } = render(<UserInfoMenu user={user} className="custom-class" />)
-    expect(container.firstChild).toHaveClass('custom-class')
+    render(<UserInfoMenu user={user} className="custom-class" />)
+    expect(screen.getByRole('button')).toHaveClass('custom-class')
   })
 
   it('should set correct Gravatar URL based on email hash', async () => {
diff --git a/apps/web/app/components/UserInfoMenu.tsx b/apps/web/app/components/UserInfoMenu.tsx
index c25b8ba..b023f40 100644
--- a/apps/web/app/components/UserInfoMenu.tsx
+++ b/apps/web/app/components/UserInfoMenu.tsx
@@ -15,7 +15,9 @@ export function UserInfoMenu({ user, onClickShowMyEvents, className }: Props) {
   return (
     <Dropdown>
       <DropdownTrigger>
-        <UserInfo user={user} className={className} as="button" />
+        <div>
+          <UserInfo user={user} className={className} as="button" />
+        </div>
       </DropdownTrigger>
       <DropdownMenu aria-label="User actions">
         <DropdownItem key="setting" href="/settings">