diff --git a/server/src/test/java/com/objectcomputing/checkins/services/fixture/FeedbackRequestFixture.java b/server/src/test/java/com/objectcomputing/checkins/services/fixture/FeedbackRequestFixture.java
index 201a67023e..bda6a1134b 100644
--- a/server/src/test/java/com/objectcomputing/checkins/services/fixture/FeedbackRequestFixture.java
+++ b/server/src/test/java/com/objectcomputing/checkins/services/fixture/FeedbackRequestFixture.java
@@ -4,6 +4,8 @@
 import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
 import com.objectcomputing.checkins.services.reviews.ReviewPeriod;
 import jnr.constants.platform.Local;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.time.LocalDate;
 
@@ -18,6 +20,8 @@
 
 public interface FeedbackRequestFixture extends RepositoryFixture, FeedbackTemplateFixture {
 
+    static final Logger LOG = LoggerFactory.getLogger(FeedbackRequestFixture.class);
+
     /**
      * Creates a sample feedback request
      * @param creator The {@link MemberProfile} of the creator of the feedback request
@@ -59,6 +63,8 @@ default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberP
     }
 
     default LocalDate getRandomLocalDateTime(LocalDateTime start, LocalDateTime end) {
+        if(start.isEqual(end)) return end.toLocalDate();
+
         LocalDate startDate = start.toLocalDate();
         long daysBetween = ChronoUnit.DAYS.between(startDate, end.toLocalDate());
         Random random = new Random();
@@ -81,6 +87,8 @@ default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberP
 
     default FeedbackRequest saveSampleFeedbackRequest(MemberProfile creator, MemberProfile requestee, MemberProfile recipient, UUID templateId, ReviewPeriod reviewPeriod, String status) {
         LocalDate submitDate = getRandomLocalDateTime(reviewPeriod.getPeriodStartDate(), reviewPeriod.getCloseDate());
+        LOG.info("Period start date: {} Generated Submit Date: {}", reviewPeriod.getPeriodStartDate(), submitDate.atStartOfDay());
+        if(submitDate.atStartOfDay().isAfter(LocalDateTime.now())) submitDate = LocalDateTime.now().toLocalDate();
         LocalDate sendDate = getRandomLocalDateTime(reviewPeriod.getPeriodStartDate(), submitDate.atStartOfDay());
         return getFeedbackRequestRepository().save(new FeedbackRequest(creator.getId(), requestee.getId(), recipient.getId(), templateId, sendDate, null, status, submitDate, reviewPeriod.getId()));
     }
diff --git a/server/src/test/java/com/objectcomputing/checkins/services/fixture/ReviewPeriodFixture.java b/server/src/test/java/com/objectcomputing/checkins/services/fixture/ReviewPeriodFixture.java
index cd2cf0eded..af3e3863d0 100644
--- a/server/src/test/java/com/objectcomputing/checkins/services/fixture/ReviewPeriodFixture.java
+++ b/server/src/test/java/com/objectcomputing/checkins/services/fixture/ReviewPeriodFixture.java
@@ -3,6 +3,7 @@
 import com.objectcomputing.checkins.services.reviews.ReviewPeriod;
 import com.objectcomputing.checkins.services.reviews.ReviewStatus;
 
+import java.time.temporal.TemporalUnit;
 import java.util.UUID;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
@@ -10,12 +11,11 @@
 public interface ReviewPeriodFixture extends RepositoryFixture {
 
     default ReviewPeriod createADefaultReviewPeriod() {
-        LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
-                                                .truncatedTo(ChronoUnit.MILLIS);
-        LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
-        LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
-        LocalDateTime startDate = launchDate.minusDays(30);
-        LocalDateTime endDate = closeDate.minusDays(1);
+        LocalDateTime launchDate = LocalDateTime.now().plusDays(1).truncatedTo(ChronoUnit.DAYS);
+        LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
+        LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
+        LocalDateTime startDate = launchDate.minusDays(31);
+        LocalDateTime endDate = launchDate.minusDays(1);
         return getReviewPeriodRepository().save(
           new ReviewPeriod("Period of Time", ReviewStatus.OPEN, null, null,
                            launchDate, selfReviewCloseDate, closeDate,
@@ -27,12 +27,11 @@ default ReviewPeriod createADefaultReviewPeriod(ReviewStatus reviewStatus) {
     }
 
     default ReviewPeriod createADefaultReviewPeriod(ReviewStatus reviewStatus, UUID templateId) {
-        LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
-                                                .truncatedTo(ChronoUnit.MILLIS);
-        LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
-        LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
-        LocalDateTime startDate = launchDate.minusDays(30);
-        LocalDateTime endDate = closeDate.minusDays(1);
+        LocalDateTime launchDate = LocalDateTime.now().plusDays(1).truncatedTo(ChronoUnit.DAYS);
+        LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
+        LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
+        LocalDateTime startDate = launchDate.minusDays(31);
+        LocalDateTime endDate = launchDate.minusDays(1);
         return getReviewPeriodRepository().save(
           new ReviewPeriod("Period of Time", reviewStatus, templateId, null,
                            launchDate, selfReviewCloseDate, closeDate,
@@ -43,12 +42,12 @@ default ReviewPeriod createADefaultReviewPeriod(
                              LocalDateTime launchDate,
                              ReviewStatus reviewStatus,
                              UUID templateId, UUID selfReviewTemplateId) {
-        launchDate = launchDate.truncatedTo(ChronoUnit.MILLIS);
+        launchDate = launchDate.truncatedTo(ChronoUnit.DAYS);
 
         LocalDateTime selfReviewCloseDate = launchDate.plusDays(4);
-        LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
-        LocalDateTime startDate = launchDate.minusDays(30);
-        LocalDateTime endDate = closeDate.minusDays(1);
+        LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
+        LocalDateTime startDate = launchDate.minusDays(31);
+        LocalDateTime endDate = launchDate.minusDays(1);
         return getReviewPeriodRepository().save(
           new ReviewPeriod("Specific Launch Date", reviewStatus, templateId,
                            selfReviewTemplateId,
@@ -57,12 +56,11 @@ default ReviewPeriod createADefaultReviewPeriod(
     }
 
     default ReviewPeriod createASecondaryReviewPeriod() {
-        LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
-                                                .truncatedTo(ChronoUnit.MILLIS);
-        LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
-        LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
-        LocalDateTime startDate = launchDate.minusDays(30);
-        LocalDateTime endDate = closeDate.minusDays(1);
+        LocalDateTime launchDate = LocalDateTime.now().plusDays(1).truncatedTo(ChronoUnit.DAYS);
+        LocalDateTime selfReviewCloseDate = launchDate.plusDays(2);
+        LocalDateTime closeDate = selfReviewCloseDate.plusDays(2);
+        LocalDateTime startDate = launchDate.minusDays(31);
+        LocalDateTime endDate = launchDate.minusDays(1);
         return getReviewPeriodRepository().save(
           new ReviewPeriod("Period of Play", ReviewStatus.OPEN, null, null,
                            launchDate, selfReviewCloseDate, closeDate,
@@ -70,19 +68,15 @@ default ReviewPeriod createASecondaryReviewPeriod() {
     }
 
     default ReviewPeriod createAClosedReviewPeriod() {
-        LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1)
-                                                .truncatedTo(ChronoUnit.MILLIS);
-        LocalDateTime selfReviewCloseDate = launchDate.plusDays(1);
-        LocalDateTime closeDate = selfReviewCloseDate.plusDays(1);
-        LocalDateTime startDate = launchDate.minusDays(30);
-        LocalDateTime endDate = closeDate.minusDays(1);
+        LocalDateTime launchDate = LocalDateTime.now().plusDays(1).truncatedTo(ChronoUnit.DAYS);
+        LocalDateTime startDate = launchDate.minusDays(31);
+        LocalDateTime endDate = launchDate.minusDays(1);
         return createAClosedReviewPeriod(startDate, endDate);
     }
 
     default ReviewPeriod createAClosedReviewPeriod(
                            LocalDateTime periodStart, LocalDateTime periodEnd) {
-        LocalDateTime launchDate = periodEnd.plusMinutes(1)
-                                                .truncatedTo(ChronoUnit.MILLIS).plusDays(1);
+        LocalDateTime launchDate = periodEnd.plusDays(1).truncatedTo(ChronoUnit.DAYS);
         LocalDateTime selfReviewCloseDate = launchDate.plusDays(3);
         LocalDateTime closeDate = selfReviewCloseDate.plusDays(7);
         return getReviewPeriodRepository().save(
diff --git a/server/src/test/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodControllerTest.java b/server/src/test/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodControllerTest.java
index 4ce4768577..261501737c 100644
--- a/server/src/test/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodControllerTest.java
+++ b/server/src/test/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodControllerTest.java
@@ -833,7 +833,7 @@ void testSelfReviewThreeDaysEmail() {
         // launch date, the self-review closes 4 days after the launch date.
         // So, to get the three day email, we just need to add 1 day to the
         // launch date.
-        LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1);
+        LocalDateTime launchDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
         checkSelfReviewEmail(launchDate, launchDate.plusDays(1),
                              " closes in three days!");
     }
@@ -844,7 +844,7 @@ void testSelfReviewOneDayEmail() {
         // launch date, the self-review closes 4 days after the launch date.
         // So, to get the one day email, we just need to add 3 days to the
         // launch date.
-        LocalDateTime launchDate = LocalDateTime.now().plusMinutes(1);
+        LocalDateTime launchDate = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
         checkSelfReviewEmail(launchDate, launchDate.plusDays(3),
                              " closes in one day!");
     }
diff --git a/web-ui/src/components/action_item/ActionItemsPanel.test.jsx b/web-ui/src/components/action_item/ActionItemsPanel.test.jsx
index 5476f74548..5f00dcf947 100644
--- a/web-ui/src/components/action_item/ActionItemsPanel.test.jsx
+++ b/web-ui/src/components/action_item/ActionItemsPanel.test.jsx
@@ -71,7 +71,7 @@ const server = setupServer(
   )
 );
 
-beforeAll(() => server.listen());
+beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} }));
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());
 
diff --git a/web-ui/src/components/agenda/Agenda.jsx b/web-ui/src/components/agenda/Agenda.jsx
index e005b9bf02..82bdd2e1ef 100644
--- a/web-ui/src/components/agenda/Agenda.jsx
+++ b/web-ui/src/components/agenda/Agenda.jsx
@@ -43,7 +43,7 @@ const AgendaItems = () => {
   const currentUserId = memberProfile?.id;
   const currentCheckin = selectCheckin(state, checkinId);
 
-  const [agendaItems, setAgendaItems] = useState();
+  const [agendaItems, setAgendaItems] = useState([]);
   const [description, setDescription] = useState('');
   const [isLoading, setIsLoading] = useState(false);
 
diff --git a/web-ui/src/components/celebrations/MyAnniversary.test.jsx b/web-ui/src/components/celebrations/MyAnniversary.test.jsx
index ae44737e12..bfbea022fb 100644
--- a/web-ui/src/components/celebrations/MyAnniversary.test.jsx
+++ b/web-ui/src/components/celebrations/MyAnniversary.test.jsx
@@ -3,7 +3,7 @@ import MyAnniversary from './MyAnniversary';
 import { AppContextProvider } from '../../context/AppContext';
 import { BrowserRouter } from 'react-router-dom';
 
-const hideMyAnniversary = false;
+const hideMyAnniversary = () => {};
 const myAnniversary = {
   name: 'Suman Maroju',
   anniversary: '12/29/2012',
diff --git a/web-ui/src/components/checkin/documents/CheckinDocs.jsx b/web-ui/src/components/checkin/documents/CheckinDocs.jsx
index 5ef08d7b86..353e0db5c6 100644
--- a/web-ui/src/components/checkin/documents/CheckinDocs.jsx
+++ b/web-ui/src/components/checkin/documents/CheckinDocs.jsx
@@ -56,7 +56,7 @@ const UploadDocs = () => {
           });
         }
       } catch (e) {
-        console.log(e);
+        console.error("getCheckinFiles: " + e);
       }
     }
     if (csrf) {
@@ -98,7 +98,7 @@ const UploadDocs = () => {
       setFiles([...files, data]);
     } catch (e) {
       setFileColors(fileColors => ({ ...fileColors, [file.name]: 'red' }));
-      console.log({ e });
+      console.error("addFiles: " + e);
     } finally {
       setLoading(false);
     }
diff --git a/web-ui/src/components/contribution_hours/ProgressBar.test.jsx b/web-ui/src/components/contribution_hours/ProgressBar.test.jsx
index 4efa37168e..a82438336a 100644
--- a/web-ui/src/components/contribution_hours/ProgressBar.test.jsx
+++ b/web-ui/src/components/contribution_hours/ProgressBar.test.jsx
@@ -3,9 +3,13 @@ import ProgressBar from './ProgressBar';
 import renderer from 'react-test-renderer';
 
 it('has billable hours', () => {
-  snapshot(<ProgressBar props={(1200, 1500, 1850, 0, 0, 0)} />);
+  snapshot(<ProgressBar billableHours={1200}
+                        contributionHours={1500}
+                        targetHours={1850} />);
 });
 
 it('has no billable hours', () => {
-  snapshot(<ProgressBar props={(0, 1500, 1850, 0, 0, 0)} />);
+  snapshot(<ProgressBar billableHours={0}
+                        contributionHours={1500}
+                        targetHours={1850} />);
 });
diff --git a/web-ui/src/components/contribution_hours/__snapshots__/ProgressBar.test.jsx.snap b/web-ui/src/components/contribution_hours/__snapshots__/ProgressBar.test.jsx.snap
index f9b1f0e150..50270e810a 100644
--- a/web-ui/src/components/contribution_hours/__snapshots__/ProgressBar.test.jsx.snap
+++ b/web-ui/src/components/contribution_hours/__snapshots__/ProgressBar.test.jsx.snap
@@ -14,13 +14,20 @@ exports[`has billable hours 1`] = `
         <span
           aria-valuemax="100"
           aria-valuemin="0"
-          aria-valuenow="50"
-          class="MuiLinearProgress-root MuiLinearProgress-colorPrimary MuiLinearProgress-determinate css-eglki6-MuiLinearProgress-root"
+          aria-valuenow="65"
+          class="MuiLinearProgress-root MuiLinearProgress-colorPrimary MuiLinearProgress-buffer css-fl5ss-MuiLinearProgress-root"
           role="progressbar"
         >
           <span
-            class="MuiLinearProgress-bar MuiLinearProgress-barColorPrimary MuiLinearProgress-bar1Determinate css-5xe99f-MuiLinearProgress-bar1"
-            style="transform: translateX(-50%);"
+            class="MuiLinearProgress-dashed MuiLinearProgress-dashedColorPrimary css-8ub8io-MuiLinearProgress-dashed"
+          />
+          <span
+            class="MuiLinearProgress-bar MuiLinearProgress-barColorPrimary MuiLinearProgress-bar1Buffer css-qhoknl-MuiLinearProgress-bar1"
+            style="transform: translateX(-35.13513513513513%);"
+          />
+          <span
+            class="MuiLinearProgress-bar MuiLinearProgress-colorPrimary MuiLinearProgress-bar2Buffer css-1qdnzt4-MuiLinearProgress-bar2"
+            style="transform: translateX(-18.91891891891892%);"
           />
         </span>
       </div>
@@ -30,9 +37,10 @@ exports[`has billable hours 1`] = `
       style="display: block;"
     >
       Billable Hours: 
+      1200
        - Contribution Hours:
        
-      925
+      1500
        - Target Hours: 
       1850
        - PTO Hours:
@@ -66,13 +74,13 @@ exports[`has no billable hours 1`] = `
         <span
           aria-valuemax="100"
           aria-valuemin="0"
-          aria-valuenow="50"
+          aria-valuenow="81"
           class="MuiLinearProgress-root MuiLinearProgress-colorPrimary MuiLinearProgress-determinate css-eglki6-MuiLinearProgress-root"
           role="progressbar"
         >
           <span
             class="MuiLinearProgress-bar MuiLinearProgress-barColorPrimary MuiLinearProgress-bar1Determinate css-5xe99f-MuiLinearProgress-bar1"
-            style="transform: translateX(-50%);"
+            style="transform: translateX(-18.91891891891892%);"
           />
         </span>
       </div>
@@ -82,9 +90,10 @@ exports[`has no billable hours 1`] = `
       style="display: block;"
     >
       Billable Hours: 
+      0
        - Contribution Hours:
        
-      925
+      1500
        - Target Hours: 
       1850
        - PTO Hours:
diff --git a/web-ui/src/components/edit_skills/EditSkillsCard.test.jsx b/web-ui/src/components/edit_skills/EditSkillsCard.test.jsx
index a5c7f197bf..94ae952868 100644
--- a/web-ui/src/components/edit_skills/EditSkillsCard.test.jsx
+++ b/web-ui/src/components/edit_skills/EditSkillsCard.test.jsx
@@ -72,7 +72,7 @@ const server = setupServer(
   })
 );
 
-beforeAll(() => server.listen());
+beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} }));
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());
 
diff --git a/web-ui/src/components/feedback_request_card/FeedbackRequestCard.jsx b/web-ui/src/components/feedback_request_card/FeedbackRequestCard.jsx
index ae439d4ef8..7bc992bba1 100644
--- a/web-ui/src/components/feedback_request_card/FeedbackRequestCard.jsx
+++ b/web-ui/src/components/feedback_request_card/FeedbackRequestCard.jsx
@@ -106,9 +106,6 @@ const FeedbackRequestCard = ({
     requestDate => {
       let oldestDate = new Date();
       switch (dateRange) {
-        case DateRange.THREE_MONTHS:
-          oldestDate.setMonth(oldestDate.getMonth() - 3);
-          break;
         case DateRange.SIX_MONTHS:
           oldestDate.setMonth(oldestDate.getMonth() - 6);
           break;
@@ -117,6 +114,7 @@ const FeedbackRequestCard = ({
           break;
         case DateRange.ALL_TIME:
           return true;
+        case DateRange.THREE_MONTHS:
         default:
           oldestDate.setMonth(oldestDate.getMonth() - 3);
       }
@@ -181,10 +179,6 @@ const FeedbackRequestCard = ({
 
     let sortMethod;
     switch (sortType) {
-      case SortOption.SENT_DATE:
-        sortMethod = (a, b) =>
-          new Date(a.sendDate) > new Date(b.sendDate) ? -1 : 1;
-        break;
       case SortOption.SUBMISSION_DATE:
         sortMethod = (a, b) =>
           !a.submitDate || new Date(a.submitDate) > new Date(b.submitDate)
@@ -205,6 +199,7 @@ const FeedbackRequestCard = ({
             ? -1
             : 1;
         break;
+      case SortOption.SENT_DATE:
       default:
         sortMethod = (a, b) =>
           new Date(a.sendDate) > new Date(b.sendDate) ? -1 : 1;
diff --git a/web-ui/src/components/feedback_request_card/FeedbackRequestCard.test.jsx b/web-ui/src/components/feedback_request_card/FeedbackRequestCard.test.jsx
index 1d78434b16..89b6087bc3 100644
--- a/web-ui/src/components/feedback_request_card/FeedbackRequestCard.test.jsx
+++ b/web-ui/src/components/feedback_request_card/FeedbackRequestCard.test.jsx
@@ -8,6 +8,8 @@ it('renders correctly', () => {
     <BrowserRouter>
       <AppContextProvider>
         <FeedbackRequestCard
+          sortType="sent_date"
+          dateRange="3mo"
           requesteeId="b2d35288-7f1e-4549-aa2b-68396b162490"
           templateName="Sample Template"
           responses={[
diff --git a/web-ui/src/components/feedback_request_card/feedback_request_subcard/FeedbackRequestSubcard.test.jsx b/web-ui/src/components/feedback_request_card/feedback_request_subcard/FeedbackRequestSubcard.test.jsx
index 3681bb294d..30a69dbdd7 100644
--- a/web-ui/src/components/feedback_request_card/feedback_request_subcard/FeedbackRequestSubcard.test.jsx
+++ b/web-ui/src/components/feedback_request_card/feedback_request_subcard/FeedbackRequestSubcard.test.jsx
@@ -4,11 +4,13 @@ import { BrowserRouter } from 'react-router-dom';
 import { AppContextProvider } from '../../../context/AppContext';
 import FeedbackRequestSubcard from './FeedbackRequestSubcard';
 
+const defaultTheme = {}
+
 it('renders correctly', () => {
   snapshot(
     <BrowserRouter>
       <AppContextProvider>
-        <ThemeProvider>
+        <ThemeProvider theme={defaultTheme}>
           <FeedbackRequestSubcard
             request={{
               id: 'c15961e4-6e9b-42cd-8140-ece9efe2445c',
diff --git a/web-ui/src/components/feedback_submit_question/FeedbackSubmitQuestion.test.jsx b/web-ui/src/components/feedback_submit_question/FeedbackSubmitQuestion.test.jsx
index c46d8e72be..fc8df5643b 100644
--- a/web-ui/src/components/feedback_submit_question/FeedbackSubmitQuestion.test.jsx
+++ b/web-ui/src/components/feedback_submit_question/FeedbackSubmitQuestion.test.jsx
@@ -10,7 +10,7 @@ it('renders the feedback submit question as text', () => {
           id: '1',
           question: 'How is the project going so far?',
           questionNumber: 1,
-          questionType: 'TEXT'
+          inputType: 'TEXT'
         }}
         readOnly={false}
         answer={{
@@ -34,7 +34,7 @@ it('renders the feedback submit question as radio buttons', () => {
           id: '1',
           question: 'Do you think the project is going well so far?',
           questionNumber: 1,
-          questionType: 'RADIO'
+          inputType: 'RADIO'
         }}
         readOnly={false}
         answer={{
@@ -58,7 +58,7 @@ it('renders the feedback submit question as a slider', () => {
           id: '1',
           question: 'Do you think the project is going well so far?',
           questionNumber: 1,
-          questionType: 'SLIDER'
+          inputType: 'SLIDER'
         }}
         readOnly={false}
         answer={{
diff --git a/web-ui/src/components/feedback_submit_question/__snapshots__/FeedbackSubmitQuestion.test.jsx.snap b/web-ui/src/components/feedback_submit_question/__snapshots__/FeedbackSubmitQuestion.test.jsx.snap
index 19fa4ce493..64a5a0343e 100644
--- a/web-ui/src/components/feedback_submit_question/__snapshots__/FeedbackSubmitQuestion.test.jsx.snap
+++ b/web-ui/src/components/feedback_submit_question/__snapshots__/FeedbackSubmitQuestion.test.jsx.snap
@@ -11,6 +11,101 @@ exports[`renders the feedback submit question as a slider 1`] = `
     >
       Do you think the project is going well so far?
     </p>
+    <span
+      class="MuiSlider-root MuiSlider-marked MuiSlider-colorPrimary MuiSlider-sizeMedium feedback-answer-slider css-ltlhnc-MuiSlider-root"
+    >
+      <span
+        class="MuiSlider-rail css-7o8aqz-MuiSlider-rail"
+      />
+      <span
+        class="MuiSlider-track css-ttgsjq-MuiSlider-track"
+        style="left: 0%; width: 50%;"
+      />
+      <span
+        class="MuiSlider-mark MuiSlider-markActive css-z5sdnj-MuiSlider-mark"
+        data-index="0"
+        style="left: 0%;"
+      />
+      <span
+        aria-hidden="true"
+        class="MuiSlider-markLabel MuiSlider-markLabel MuiSlider-markLabelActive css-1ucwjgd-MuiSlider-markLabel"
+        data-index="0"
+        style="left: 0%;"
+      >
+        Strongly Disagree
+      </span>
+      <span
+        class="MuiSlider-mark MuiSlider-markActive css-z5sdnj-MuiSlider-mark"
+        data-index="1"
+        style="left: 25%;"
+      />
+      <span
+        aria-hidden="true"
+        class="MuiSlider-markLabel MuiSlider-markLabel MuiSlider-markLabelActive css-1ucwjgd-MuiSlider-markLabel"
+        data-index="1"
+        style="left: 25%;"
+      >
+        Disagree
+      </span>
+      <span
+        class="MuiSlider-mark MuiSlider-markActive css-z5sdnj-MuiSlider-mark"
+        data-index="2"
+        style="left: 50%;"
+      />
+      <span
+        aria-hidden="true"
+        class="MuiSlider-markLabel MuiSlider-markLabel MuiSlider-markLabelActive css-1ucwjgd-MuiSlider-markLabel"
+        data-index="2"
+        style="left: 50%;"
+      >
+        Neither Agree nor Disagree
+      </span>
+      <span
+        class="MuiSlider-mark css-hzp7sc-MuiSlider-mark"
+        data-index="3"
+        style="left: 75%;"
+      />
+      <span
+        aria-hidden="true"
+        class="MuiSlider-markLabel MuiSlider-markLabel css-1bvr8oc-MuiSlider-markLabel"
+        data-index="3"
+        style="left: 75%;"
+      >
+        Agree
+      </span>
+      <span
+        class="MuiSlider-mark css-hzp7sc-MuiSlider-mark"
+        data-index="4"
+        style="left: 100%;"
+      />
+      <span
+        aria-hidden="true"
+        class="MuiSlider-markLabel MuiSlider-markLabel css-1bvr8oc-MuiSlider-markLabel"
+        data-index="4"
+        style="left: 100%;"
+      >
+        Strongly Agree
+      </span>
+      <span
+        class="MuiSlider-thumb MuiSlider-thumbSizeMedium MuiSlider-thumbColorPrimary MuiSlider-thumb MuiSlider-thumbSizeMedium MuiSlider-thumbColorPrimary css-cp2j25-MuiSlider-thumb"
+        data-index="0"
+        style="left: 50%;"
+      >
+        <input
+          aria-orientation="horizontal"
+          aria-valuemax="4"
+          aria-valuemin="0"
+          aria-valuenow="2"
+          data-index="0"
+          max="4"
+          min="0"
+          step="1"
+          style="border: 0px; height: 100%; margin: -1px; overflow: hidden; padding: 0px; position: absolute; white-space: nowrap; width: 100%; direction: ltr;"
+          type="range"
+          value="2"
+        />
+      </span>
+    </span>
   </div>
 </div>
 `;
@@ -26,6 +121,108 @@ exports[`renders the feedback submit question as radio buttons 1`] = `
     >
       Do you think the project is going well so far?
     </p>
+    <div
+      class="MuiFormGroup-root MuiFormGroup-row MuiRadioGroup-root MuiRadioGroup-row feedback-answer-radio css-qfz70r-MuiFormGroup-root"
+      role="radiogroup"
+    >
+      <label
+        class="MuiFormControlLabel-root MuiFormControlLabel-labelPlacementEnd css-j204z7-MuiFormControlLabel-root"
+      >
+        <span
+          class="MuiButtonBase-root MuiRadio-root MuiRadio-colorPrimary PrivateSwitchBase-root MuiRadio-root MuiRadio-colorPrimary Mui-checked MuiRadio-root MuiRadio-colorPrimary css-vqmohf-MuiButtonBase-root-MuiRadio-root"
+        >
+          <input
+            checked=""
+            class="PrivateSwitchBase-input css-1m9pwf3"
+            name=":r1:"
+            type="radio"
+            value="Yes"
+          />
+          <span
+            class="css-hyxlzm"
+          >
+            <svg
+              aria-hidden="true"
+              class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-1hbvpl3-MuiSvgIcon-root"
+              data-testid="RadioButtonUncheckedIcon"
+              focusable="false"
+              viewBox="0 0 24 24"
+            >
+              <path
+                d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+              />
+            </svg>
+            <svg
+              aria-hidden="true"
+              class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-11zohuh-MuiSvgIcon-root"
+              data-testid="RadioButtonCheckedIcon"
+              focusable="false"
+              viewBox="0 0 24 24"
+            >
+              <path
+                d="M8.465 8.465C9.37 7.56 10.62 7 12 7C14.76 7 17 9.24 17 12C17 13.38 16.44 14.63 15.535 15.535C14.63 16.44 13.38 17 12 17C9.24 17 7 14.76 7 12C7 10.62 7.56 9.37 8.465 8.465Z"
+              />
+            </svg>
+          </span>
+          <span
+            class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+          />
+        </span>
+        <span
+          class="MuiTypography-root MuiTypography-body1 MuiFormControlLabel-label css-ahj2mt-MuiTypography-root"
+        >
+          Yes
+        </span>
+      </label>
+      <label
+        class="MuiFormControlLabel-root MuiFormControlLabel-labelPlacementEnd css-j204z7-MuiFormControlLabel-root"
+      >
+        <span
+          class="MuiButtonBase-root MuiRadio-root MuiRadio-colorPrimary PrivateSwitchBase-root MuiRadio-root MuiRadio-colorPrimary MuiRadio-root MuiRadio-colorPrimary css-vqmohf-MuiButtonBase-root-MuiRadio-root"
+        >
+          <input
+            class="PrivateSwitchBase-input css-1m9pwf3"
+            name=":r1:"
+            type="radio"
+            value="No"
+          />
+          <span
+            class="css-hyxlzm"
+          >
+            <svg
+              aria-hidden="true"
+              class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-1hbvpl3-MuiSvgIcon-root"
+              data-testid="RadioButtonUncheckedIcon"
+              focusable="false"
+              viewBox="0 0 24 24"
+            >
+              <path
+                d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+              />
+            </svg>
+            <svg
+              aria-hidden="true"
+              class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-1hhw7if-MuiSvgIcon-root"
+              data-testid="RadioButtonCheckedIcon"
+              focusable="false"
+              viewBox="0 0 24 24"
+            >
+              <path
+                d="M8.465 8.465C9.37 7.56 10.62 7 12 7C14.76 7 17 9.24 17 12C17 13.38 16.44 14.63 15.535 15.535C14.63 16.44 13.38 17 12 17C9.24 17 7 14.76 7 12C7 10.62 7.56 9.37 8.465 8.465Z"
+              />
+            </svg>
+          </span>
+          <span
+            class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+          />
+        </span>
+        <span
+          class="MuiTypography-root MuiTypography-body1 MuiFormControlLabel-label css-ahj2mt-MuiTypography-root"
+        >
+          No
+        </span>
+      </label>
+    </div>
   </div>
 </div>
 `;
@@ -41,6 +238,44 @@ exports[`renders the feedback submit question as text 1`] = `
     >
       How is the project going so far?
     </p>
+    <div
+      class="MuiFormControl-root MuiTextField-root fullWidth feedback-answer-text-field css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
+    >
+      <div
+        class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-multiline css-dpjnhs-MuiInputBase-root-MuiOutlinedInput-root"
+      >
+        <textarea
+          aria-invalid="false"
+          class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMultiline css-1sqnrkk-MuiInputBase-input-MuiOutlinedInput-input"
+          id=":r0:"
+          rows="5"
+          style="height: 0px; overflow: hidden;"
+        >
+          Good
+        </textarea>
+        <textarea
+          aria-hidden="true"
+          class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMultiline css-1sqnrkk-MuiInputBase-input-MuiOutlinedInput-input"
+          readonly=""
+          style="visibility: hidden; position: absolute; overflow: hidden; height: 0px; top: 0px; left: 0px; transform: translateZ(0); padding-top: 0px; padding-bottom: 0px; width: 100%;"
+          tabindex="-1"
+        />
+        <fieldset
+          aria-hidden="true"
+          class="MuiOutlinedInput-notchedOutline css-1d3z3hw-MuiOutlinedInput-notchedOutline"
+        >
+          <legend
+            class="css-ihdtdm"
+          >
+            <span
+              class="notranslate"
+            >
+              ​
+            </span>
+          </legend>
+        </fieldset>
+      </div>
+    </div>
   </div>
 </div>
 `;
diff --git a/web-ui/src/components/guild-results/EditGuildModal.spec.jsx b/web-ui/src/components/guild-results/EditGuildModal.spec.jsx
index dced872d30..bbc3943f2d 100644
--- a/web-ui/src/components/guild-results/EditGuildModal.spec.jsx
+++ b/web-ui/src/components/guild-results/EditGuildModal.spec.jsx
@@ -20,7 +20,7 @@ const server = setupServer(
   })
 );
 
-beforeAll(() => server.listen());
+beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} }));
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());
 
diff --git a/web-ui/src/components/guild-results/GuildSummaryCard.test.jsx b/web-ui/src/components/guild-results/GuildSummaryCard.test.jsx
index 3d5f6a41e0..bd7b5c6cec 100644
--- a/web-ui/src/components/guild-results/GuildSummaryCard.test.jsx
+++ b/web-ui/src/components/guild-results/GuildSummaryCard.test.jsx
@@ -51,7 +51,7 @@ it('renders correctly', () => {
   snapshot(
     <AppContextProvider value={initialState}>
       <BrowserRouter>
-        <GuildSummaryCard guild={guilds[0]} />
+        <GuildSummaryCard guild={guilds[0]} isOpen={false} />
       </BrowserRouter>
     </AppContextProvider>
   );
@@ -61,7 +61,7 @@ it('renders correctly for ADMIN', () => {
   snapshot(
     <AppContextProvider value={adminState}>
       <BrowserRouter>
-        <GuildSummaryCard guild={guilds[0]} />
+        <GuildSummaryCard guild={guilds[0]} isOpen={false} />
       </BrowserRouter>
     </AppContextProvider>
   );
@@ -71,7 +71,7 @@ it('renders correctly for guild lead', () => {
   snapshot(
     <AppContextProvider value={initialState}>
       <BrowserRouter>
-        <GuildSummaryCard guild={guilds[1]} />
+        <GuildSummaryCard guild={guilds[1]} isOpen={false}/>
       </BrowserRouter>
     </AppContextProvider>
   );
diff --git a/web-ui/src/components/member_selector/MemberSelector.jsx b/web-ui/src/components/member_selector/MemberSelector.jsx
index 508282b11a..7d4e2e990f 100644
--- a/web-ui/src/components/member_selector/MemberSelector.jsx
+++ b/web-ui/src/components/member_selector/MemberSelector.jsx
@@ -153,13 +153,15 @@ const MemberSelector = ({
           action={
             <Box sx={{ mr: 2 }}>
               <Tooltip title={`Change ${memberDescriptor}`} arrow>
-                <IconButton
-                  style={{ margin: '4px 8px 0 0' }}
-                  onClick={() => setDialogOpen(true)}
-                  disabled={disabled}
-                >
-                  <Add />
-                </IconButton>
+                <span>
+                  <IconButton
+                    style={{ margin: '4px 8px 0 0' }}
+                    onClick={() => setDialogOpen(true)}
+                    disabled={disabled}
+                  >
+                    <Add />
+                  </IconButton>
+                </span>
               </Tooltip>
               {exportable && (
                 <Tooltip title="Download">
diff --git a/web-ui/src/components/member_selector/__snapshots__/MemberSelector.test.jsx.snap b/web-ui/src/components/member_selector/__snapshots__/MemberSelector.test.jsx.snap
index d1dcddbe1a..7833e0e042 100644
--- a/web-ui/src/components/member_selector/__snapshots__/MemberSelector.test.jsx.snap
+++ b/web-ui/src/components/member_selector/__snapshots__/MemberSelector.test.jsx.snap
@@ -39,29 +39,33 @@ exports[`MemberSelector > renders correctly as a controlled component 1`] = `
         <div
           class="MuiBox-root css-1ay9vb9"
         >
-          <button
+          <span
             aria-label="Change Members"
-            class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
+            class=""
             data-mui-internal-clone-element="true"
-            style="margin: 4px 8px 0px 0px;"
-            tabindex="0"
-            type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
-              data-testid="AddIcon"
-              focusable="false"
-              viewBox="0 0 24 24"
+            <button
+              class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
+              style="margin: 4px 8px 0px 0px;"
+              tabindex="0"
+              type="button"
             >
-              <path
-                d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
+                data-testid="AddIcon"
+                focusable="false"
+                viewBox="0 0 24 24"
+              >
+                <path
+                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"
+                />
+              </svg>
+              <span
+                class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
               />
-            </svg>
-            <span
-              class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
-            />
-          </button>
+            </button>
+          </span>
           <button
             aria-label="Download"
             class="MuiButtonBase-root MuiIconButton-root MuiIconButton-edgeEnd MuiIconButton-sizeMedium css-1yq5fb3-MuiButtonBase-root-MuiIconButton-root"
@@ -129,27 +133,31 @@ exports[`MemberSelector > renders correctly when disabled 1`] = `
         <div
           class="MuiBox-root css-1ay9vb9"
         >
-          <button
+          <span
             aria-label="Change Members"
-            class="MuiButtonBase-root Mui-disabled MuiIconButton-root Mui-disabled MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
+            class=""
             data-mui-internal-clone-element="true"
-            disabled=""
-            style="margin: 4px 8px 0px 0px;"
-            tabindex="-1"
-            type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
-              data-testid="AddIcon"
-              focusable="false"
-              viewBox="0 0 24 24"
+            <button
+              class="MuiButtonBase-root Mui-disabled MuiIconButton-root Mui-disabled MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
+              disabled=""
+              style="margin: 4px 8px 0px 0px;"
+              tabindex="-1"
+              type="button"
             >
-              <path
-                d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"
-              />
-            </svg>
-          </button>
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
+                data-testid="AddIcon"
+                focusable="false"
+                viewBox="0 0 24 24"
+              >
+                <path
+                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"
+                />
+              </svg>
+            </button>
+          </span>
         </div>
       </div>
     </div>
@@ -195,29 +203,33 @@ exports[`MemberSelector > renders correctly with default props 1`] = `
         <div
           class="MuiBox-root css-1ay9vb9"
         >
-          <button
+          <span
             aria-label="Change Members"
-            class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
+            class=""
             data-mui-internal-clone-element="true"
-            style="margin: 4px 8px 0px 0px;"
-            tabindex="0"
-            type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
-              data-testid="AddIcon"
-              focusable="false"
-              viewBox="0 0 24 24"
+            <button
+              class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
+              style="margin: 4px 8px 0px 0px;"
+              tabindex="0"
+              type="button"
             >
-              <path
-                d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
+                data-testid="AddIcon"
+                focusable="false"
+                viewBox="0 0 24 24"
+              >
+                <path
+                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"
+                />
+              </svg>
+              <span
+                class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
               />
-            </svg>
-            <span
-              class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
-            />
-          </button>
+            </button>
+          </span>
         </div>
       </div>
     </div>
diff --git a/web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.spec.jsx b/web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.spec.jsx
index 9d36237959..c919b78945 100644
--- a/web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.spec.jsx
+++ b/web-ui/src/components/member_selector/member_selector_dialog/MemberSelectorDialog.spec.jsx
@@ -78,7 +78,7 @@ const server = setupServer(
   )
 );
 
-beforeAll(() => server.listen());
+beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} }));
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());
 
diff --git a/web-ui/src/components/notes/Note.jsx b/web-ui/src/components/notes/Note.jsx
index a353856fbf..df1ac56245 100644
--- a/web-ui/src/components/notes/Note.jsx
+++ b/web-ui/src/components/notes/Note.jsx
@@ -85,7 +85,7 @@ const Notes = props => {
           }
         }
       } catch (e) {
-        console.log(e);
+        console.error("getNotes: " + e);
       }
       setIsLoading(false);
     }
diff --git a/web-ui/src/components/private-note/PrivateNote.jsx b/web-ui/src/components/private-note/PrivateNote.jsx
index d964c9c26f..4e7eaf717b 100644
--- a/web-ui/src/components/private-note/PrivateNote.jsx
+++ b/web-ui/src/components/private-note/PrivateNote.jsx
@@ -91,7 +91,7 @@ const PrivateNote = () => {
           }
         }
       } catch (e) {
-        console.log(e);
+        console.error("getPrivateNotes: " + e);
       }
       setIsLoading(false);
     }
diff --git a/web-ui/src/components/team-results/EditTeamModal.spec.jsx b/web-ui/src/components/team-results/EditTeamModal.spec.jsx
index d3f3825947..c1ddefbd01 100644
--- a/web-ui/src/components/team-results/EditTeamModal.spec.jsx
+++ b/web-ui/src/components/team-results/EditTeamModal.spec.jsx
@@ -20,7 +20,7 @@ const server = setupServer(
   })
 );
 
-beforeAll(() => server.listen());
+beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} }));
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());
 
diff --git a/web-ui/src/components/team-results/TeamSummaryCard.test.jsx b/web-ui/src/components/team-results/TeamSummaryCard.test.jsx
index 8945e2957c..937367ce03 100644
--- a/web-ui/src/components/team-results/TeamSummaryCard.test.jsx
+++ b/web-ui/src/components/team-results/TeamSummaryCard.test.jsx
@@ -15,7 +15,7 @@ const teams = [
     description: '',
     teamMembers: [
       {
-        memberid: '3fa4-5717-4562-b3fc-2c963f66afa9',
+        memberId: '3fa4-5717-4562-b3fc-2c963f66afa9',
         name: 'testname',
         lead: true
       }
diff --git a/web-ui/src/components/team-results/TeamsActions.test.jsx b/web-ui/src/components/team-results/TeamsActions.test.jsx
index ce3e7031bb..aaa1f51a7d 100644
--- a/web-ui/src/components/team-results/TeamsActions.test.jsx
+++ b/web-ui/src/components/team-results/TeamsActions.test.jsx
@@ -33,7 +33,7 @@ const initialState = {
 it('renders correctly', () => {
   snapshot(
     <AppContextProvider value={initialState}>
-      <TeamsActions />
+      <TeamsActions isOpen={false} />
     </AppContextProvider>
   );
 });
diff --git a/web-ui/src/components/team-results/__snapshots__/TeamSummaryCard.test.jsx.snap b/web-ui/src/components/team-results/__snapshots__/TeamSummaryCard.test.jsx.snap
index 6b55c57066..e3bb03f12f 100644
--- a/web-ui/src/components/team-results/__snapshots__/TeamSummaryCard.test.jsx.snap
+++ b/web-ui/src/components/team-results/__snapshots__/TeamSummaryCard.test.jsx.snap
@@ -188,7 +188,7 @@ exports[`renders correctly for team lead 1`] = `
         Team Leads: 
       </strong>
       <a
-        href="/profile/undefined"
+        href="/profile/3fa4-5717-4562-b3fc-2c963f66afa9"
         style="text-decoration: none;"
       >
         testname
@@ -200,7 +200,48 @@ exports[`renders correctly for team lead 1`] = `
     </div>
     <div
       class="MuiCardActions-root MuiCardActions-spacing css-dnrpxu-MuiCardActions-root"
-    />
+    >
+      <div>
+        <div
+          aria-label="split button"
+          class="MuiButtonGroup-root MuiButtonGroup-contained css-1d9bq45-MuiButtonGroup-root"
+          role="group"
+        >
+          <button
+            class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButtonGroup-grouped MuiButtonGroup-groupedHorizontal MuiButtonGroup-groupedContained MuiButtonGroup-groupedContainedHorizontal MuiButtonGroup-groupedContainedPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButtonGroup-grouped MuiButtonGroup-groupedHorizontal MuiButtonGroup-groupedContained MuiButtonGroup-groupedContainedHorizontal MuiButtonGroup-groupedContainedPrimary MuiButtonGroup-firstButton css-sghohy-MuiButtonBase-root-MuiButton-root"
+            tabindex="0"
+            type="button"
+          >
+            Edit Team
+            <span
+              class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+            />
+          </button>
+          <button
+            aria-haspopup="menu"
+            aria-label="select merge strategy"
+            class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeSmall MuiButton-containedSizeSmall MuiButton-colorPrimary MuiButtonGroup-grouped MuiButtonGroup-groupedHorizontal MuiButtonGroup-groupedContained MuiButtonGroup-groupedContainedHorizontal MuiButtonGroup-groupedContainedPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeSmall MuiButton-containedSizeSmall MuiButton-colorPrimary MuiButtonGroup-grouped MuiButtonGroup-groupedHorizontal MuiButtonGroup-groupedContained MuiButtonGroup-groupedContainedHorizontal MuiButtonGroup-groupedContainedPrimary MuiButtonGroup-lastButton css-11qr2p8-MuiButtonBase-root-MuiButton-root"
+            tabindex="0"
+            type="button"
+          >
+            <svg
+              aria-hidden="true"
+              class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
+              data-testid="ArrowDropDownIcon"
+              focusable="false"
+              viewBox="0 0 24 24"
+            >
+              <path
+                d="m7 10 5 5 5-5z"
+              />
+            </svg>
+            <span
+              class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+            />
+          </button>
+        </div>
+      </div>
+    </div>
   </div>
 </div>
 `;
diff --git a/web-ui/src/components/template-card/TemplateCard.test.jsx b/web-ui/src/components/template-card/TemplateCard.test.jsx
index 51aaf357b3..b279cc8890 100644
--- a/web-ui/src/components/template-card/TemplateCard.test.jsx
+++ b/web-ui/src/components/template-card/TemplateCard.test.jsx
@@ -8,7 +8,7 @@ it('renders correctly', () => {
       <TemplateCard
         title="Template"
         description="Sample feedback template"
-        creator="Admin"
+        creatorId="84682de9-85a7-4bf7-b74b-e9054311a61a"
       />
     </AppContextProvider>
   );
diff --git a/web-ui/src/pages/EditPermissionsPage.jsx b/web-ui/src/pages/EditPermissionsPage.jsx
index 350f50b1e1..579080bd79 100644
--- a/web-ui/src/pages/EditPermissionsPage.jsx
+++ b/web-ui/src/pages/EditPermissionsPage.jsx
@@ -229,7 +229,7 @@ const EditPermissionsPage = () => {
         }
       });
     } else {
-      console.log(res?.error);
+      console.error(res?.error);
       window.snackDispatch({
         type: UPDATE_TOAST,
         payload: {
@@ -253,7 +253,7 @@ const EditPermissionsPage = () => {
         }
       });
     } else {
-      console.log(res?.error);
+      console.error(res?.error);
       window.snackDispatch({
         type: UPDATE_TOAST,
         payload: {
diff --git a/web-ui/src/pages/FeedbackRequestPage.jsx b/web-ui/src/pages/FeedbackRequestPage.jsx
index 6981ad8556..88486a98a6 100644
--- a/web-ui/src/pages/FeedbackRequestPage.jsx
+++ b/web-ui/src/pages/FeedbackRequestPage.jsx
@@ -191,13 +191,6 @@ const FeedbackRequestPage = () => {
         return hasFor() && templateIsValid && hasFrom();
       } else if (activeStep === 3) {
         const dueQueryValid = query.due ? isValidDate(query.due) : true;
-        console.log({
-          hasFor: hasFor(),
-          templateIsValid,
-          hasFrom: hasFrom(),
-          hasSend: hasSend(),
-          dueQueryValid
-        });
         return (
           hasFor() && templateIsValid && hasFrom() && hasSend() && dueQueryValid
         );
diff --git a/web-ui/src/pages/PeoplePage.jsx b/web-ui/src/pages/PeoplePage.jsx
index 04d3a7723e..f35b2c3679 100644
--- a/web-ui/src/pages/PeoplePage.jsx
+++ b/web-ui/src/pages/PeoplePage.jsx
@@ -42,7 +42,7 @@ const PeoplePage = () => {
   const { state } = useContext(AppContext);
   const loading = selectMemberProfilesLoading(state);
 
-  const [kudosDialogOpen, setKudosDialogOpen] = useState(null);
+  const [kudosDialogOpen, setKudosDialogOpen] = useState(false);
   const [searchText, setSearchText] = useState('');
 
   const normalizedMembers = selectNormalizedMembers(state, searchText);
diff --git a/web-ui/src/pages/SettingsPage.test.jsx b/web-ui/src/pages/SettingsPage.test.jsx
index d1d7c25022..4f114b8ce7 100644
--- a/web-ui/src/pages/SettingsPage.test.jsx
+++ b/web-ui/src/pages/SettingsPage.test.jsx
@@ -47,7 +47,7 @@ const server = setupServer(
   }),
 );
 
-beforeAll(() => server.listen());
+beforeAll(() => server.listen({ onUnhandledRequest(request, print) {} }));
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());
 
diff --git a/web-ui/src/pages/__snapshots__/TeamSkillReportPage.test.jsx.snap b/web-ui/src/pages/__snapshots__/TeamSkillReportPage.test.jsx.snap
index 7ffd85457c..b7b15e4007 100644
--- a/web-ui/src/pages/__snapshots__/TeamSkillReportPage.test.jsx.snap
+++ b/web-ui/src/pages/__snapshots__/TeamSkillReportPage.test.jsx.snap
@@ -49,29 +49,33 @@ exports[`renders correctly 1`] = `
           <div
             class="MuiBox-root css-1ay9vb9"
           >
-            <button
+            <span
               aria-label="Change Members"
-              class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
+              class=""
               data-mui-internal-clone-element="true"
-              style="margin: 4px 8px 0px 0px;"
-              tabindex="0"
-              type="button"
             >
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
-                data-testid="AddIcon"
-                focusable="false"
-                viewBox="0 0 24 24"
+              <button
+                class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
+                style="margin: 4px 8px 0px 0px;"
+                tabindex="0"
+                type="button"
               >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"
+                <svg
+                  aria-hidden="true"
+                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
+                  data-testid="AddIcon"
+                  focusable="false"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"
+                  />
+                </svg>
+                <span
+                  class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
                 />
-              </svg>
-              <span
-                class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
-              />
-            </button>
+              </button>
+            </span>
           </div>
         </div>
       </div>