diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.test.tsx
index 85d3ef09281..9a0379c6230 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.test.tsx
@@ -173,12 +173,12 @@ describe('ContainerDataModel', () => {
     );
     const rows = await screen.findAllByRole('row');
 
-    const row1 = rows[0];
+    const row1 = rows[1];
 
     expect(containerDataModel).toBeInTheDocument();
 
     // should render header row and content row
-    expect(rows).toHaveLength(4);
+    expect(rows).toHaveLength(5);
 
     const name = await findByText(row1, 'department_id');
     const dataType = await findByText(row1, 'numeric');
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx
index 759955b2a37..a25f8de3699 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx
@@ -78,7 +78,7 @@ describe('EditTestCaseModal Component', () => {
     expect(await screen.findByText('label.submit')).toBeInTheDocument();
   });
 
-  it.skip('table, name, test definition, should be disabled', async () => {
+  it('table, name, test definition, should be disabled', async () => {
     render(<EditTestCaseModal {...mockProps} />);
 
     expect(await screen.findByLabelText('label.name')).toBeDisabled();
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx
index 69d0b6f2470..cf0ae4e1b37 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx
@@ -871,8 +871,6 @@ const GlossaryTermTab = ({ isGlossary, className }: GlossaryTermTabProps) => {
               loading={isTableLoading || termsLoading}
               pagination={false}
               rowKey="fullyQualifiedName"
-              // Had to pass y: 'auto' to override default styling from Table component
-              scroll={{ y: 'auto' }}
               size="small"
               staticVisibleColumns={STATIC_VISIBLE_COLUMNS}
               onHeaderRow={onTableHeader}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.test.tsx
index 0f7753ab51b..4a3a20a3bd7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.test.tsx
@@ -88,7 +88,7 @@ describe('Test CustomField Table Component', () => {
 
     const tableRow = await findAllByRole('row');
 
-    expect(tableRow).toHaveLength(mockProperties.length);
+    expect(tableRow).toHaveLength(mockProperties.length + 1);
   });
 
   it('Test delete property flow', async () => {
@@ -111,7 +111,7 @@ describe('Test CustomField Table Component', () => {
 
     const tableRow = await screen.findAllByRole('row');
 
-    expect(tableRow).toHaveLength(mockProperties.length);
+    expect(tableRow).toHaveLength(mockProperties.length + 1);
 
     const dataRow = tableRow[1];
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamHierarchy.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamHierarchy.test.tsx
index af25f176ef2..f4cc8428f9c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamHierarchy.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamHierarchy.test.tsx
@@ -118,7 +118,7 @@ describe('Team Hierarchy page', () => {
     expect(assetCountColumn).toBeInTheDocument();
     expect(descriptionColumn).toBeInTheDocument();
 
-    expect(rows).toHaveLength(MOCK_TABLE_DATA.length);
+    expect(rows).toHaveLength(MOCK_TABLE_DATA.length + 1);
   });
 
   it('Should render child row in table', async () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.test.tsx
index 20504d61fb8..3d05ea625ef 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.test.tsx
@@ -33,8 +33,7 @@ describe('TeamImportResult component', () => {
     expect(
       await screen.findByTestId('import-result-table')
     ).toBeInTheDocument();
-    // only 3 row because of the header is excluded
-    expect(row).toHaveLength(3);
+    expect(row).toHaveLength(4);
   });
 
   it('Component should render id no data provided', async () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.test.tsx
index 6f2b55447f1..e7380b7ca65 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.test.tsx
@@ -35,7 +35,7 @@ describe('UserImportResult component', () => {
     expect(
       await screen.findByTestId('import-result-table')
     ).toBeInTheDocument();
-    expect(row).toHaveLength(3);
+    expect(row).toHaveLength(4);
   });
 
   it('Component should render id no data provided', async () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx
index 2923c8c76a6..41ce0d298d0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx
@@ -162,12 +162,12 @@ describe('Topic Schema', () => {
     const schemaFields = await screen.findByTestId('topic-schema-fields-table');
     const rows = await screen.findAllByRole('row');
 
-    const row1 = rows[0];
+    const row1 = rows[1];
 
     expect(schemaFields).toBeInTheDocument();
 
     // should render header row and content row
-    expect(rows).toHaveLength(19);
+    expect(rows).toHaveLength(20);
 
     const name = await findByText(row1, 'Order');
     const dataType = await findByText(row1, 'RECORD');
@@ -185,7 +185,7 @@ describe('Topic Schema', () => {
 
     const rows = await screen.findAllByRole('row');
 
-    const nestedRow = rows[0];
+    const nestedRow = rows[1];
     const singleRow = rows[2];
 
     const expandIcon = await findByTestId(nestedRow, 'expand-icon');
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Table/Table.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Table/Table.tsx
index c131a341c1f..62f506d5755 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/Table/Table.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Table/Table.tsx
@@ -311,11 +311,6 @@ const Table = <T extends Record<string, unknown>>(
           ref={ref}
           tableLayout="fixed"
           {...resizingTableProps}
-          scroll={{
-            y: 740,
-            x: resizingTableProps.scroll?.x ?? rest.scroll?.x,
-            ...rest.scroll,
-          }}
         />
       </Col>
       {customPaginationProps && customPaginationProps.showPagination ? (
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityProvider.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityProvider.test.tsx
index 8ad05ab9398..a401637fa94 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityProvider.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityProvider.test.tsx
@@ -101,7 +101,7 @@ const MockComponent = () => {
   );
 };
 
-describe.skip('DataQualityProvider', () => {
+describe('DataQualityProvider', () => {
   beforeEach(() => {
     render(
       <DataQualityProvider>