diff --git a/__tests__/components/AccessList.test.jsx b/__tests__/components/AccessList.test.jsx
index 1cb93ac9da..ce9a49c132 100644
--- a/__tests__/components/AccessList.test.jsx
+++ b/__tests__/components/AccessList.test.jsx
@@ -5,7 +5,7 @@ import { I18nProvider } from '@lingui/react';
 
 import AccessList from '../../src/components/AccessList';
 
-const mockResults = [
+const mockData = [
   {
     id: 1,
     username: 'boo',
@@ -48,7 +48,7 @@ describe('<AccessList />', () => {
           <AccessList
             match={{ path: '/organizations/:id', url: '/organizations/1', params: { id: '0' } }}
             location={{ search: '', pathname: '/organizations/1/access' }}
-            getAccessList={() => ({ data: { count: 1, results: mockResults } })}
+            getAccessList={() => ({ data: { count: 1, results: mockData } })}
             removeRole={() => {}}
           />
         </MemoryRouter>
@@ -56,7 +56,7 @@ describe('<AccessList />', () => {
     ).find('AccessList');
 
     setImmediate(() => {
-      expect(wrapper.state().results).toEqual(mockResults);
+      expect(wrapper.state().results).toEqual(mockData);
       done();
     });
   });
@@ -70,7 +70,7 @@ describe('<AccessList />', () => {
           <AccessList
             match={{ path: '/organizations/:id', url: '/organizations/1', params: { id: '0' } }}
             location={{ search: '', pathname: '/organizations/1/access' }}
-            getAccessList={() => ({ data: { count: 1, results: mockResults } })}
+            getAccessList={() => ({ data: { count: 1, results: mockData } })}
             removeRole={() => {}}
           />
         </MemoryRouter>
@@ -97,7 +97,7 @@ describe('<AccessList />', () => {
           <AccessList
             match={{ path: '/organizations/:id', url: '/organizations/1', params: { id: '0' } }}
             location={{ search: '', pathname: '/organizations/1/access' }}
-            getAccessList={() => ({ data: { count: 1, results: mockResults } })}
+            getAccessList={() => ({ data: { count: 1, results: mockData } })}
             removeRole={() => {}}
           />
         </MemoryRouter>
@@ -114,33 +114,7 @@ describe('<AccessList />', () => {
   });
 
   test('getTeamRoles returns empty array if dataset is missing team_id attribute', (done) => {
-    const mockData = [
-      {
-        id: 1,
-        username: 'boo',
-        url: '/foo/bar/',
-        first_name: 'john',
-        last_name: 'smith',
-        summary_fields: {
-          foo: [
-            {
-              role: {
-                name: 'foo',
-                id: 2,
-              }
-            }
-          ],
-          direct_access: [
-            {
-              role: {
-                name: 'team user',
-                id: 3,
-              }
-            }
-          ]
-        }
-      }
-    ];
+    
     const wrapper = mount(
       <I18nProvider>
         <MemoryRouter>
@@ -163,7 +137,7 @@ describe('<AccessList />', () => {
     });
   });
 
-  test('test handleWarning, confirmDelete, and removeRole methods for Alert component', async (done) => {
+  test('test handleWarning, confirmDelete, and removeRole methods for Alert component', (done) => {
     const handleWarning = jest.spyOn(AccessList.prototype, 'handleWarning');
     const confirmDelete = jest.spyOn(AccessList.prototype, 'confirmDelete');
     const removeRole = jest.spyOn(AccessList.prototype, 'removeRole');
@@ -173,7 +147,7 @@ describe('<AccessList />', () => {
           <AccessList
             match={{ path: '/organizations/:id', url: '/organizations/1', params: { id: '0' } }}
             location={{ search: '', pathname: '/organizations/1/access' }}
-            getAccessList={() => ({ data: { count: 1, results: mockResults } })}
+            getAccessList={() => ({ data: { count: 1, results: mockData } })}
             removeRole={() => {}}
           />
         </MemoryRouter>
@@ -194,4 +168,51 @@ describe('<AccessList />', () => {
       done();
     });
   });
+
+  test('state is set appropriately when a user tries deleting a role', (done) => {
+    const wrapper = mount(
+      <I18nProvider>
+        <MemoryRouter>
+          <AccessList
+            match={{ path: '/organizations/:id', url: '/organizations/1', params: { id: '0' } }}
+            location={{ search: '', pathname: '/organizations/1/access' }}
+            getAccessList={() => ({ data: { count: 1, results: mockData } })}
+            removeRole={() => {}}
+          />
+        </MemoryRouter>
+      </I18nProvider>
+    ).find('AccessList');
+    
+    expect(wrapper.state().warningMsg).not.toBeDefined;
+    expect(wrapper.state().warningTitle).not.toBeDefined;
+    expect(wrapper.state().deleteType).not.toBeDefined;
+    expect(wrapper.state().deleteRoleId).not.toBeDefined;
+    expect(wrapper.state().deleteResourceId).not.toBeDefined;
+
+    setImmediate(() => {
+      const expected = [
+        {
+          deleteType: 'users'
+        },
+        { 
+          deleteRoleId: mockData[0].summary_fields.foo[0].role.id
+        },
+        {
+          deleteResourceId: mockData[0].id
+        }
+      ];
+      const rendered = wrapper.update().find('ChipButton');
+      rendered.find('button[aria-label="close"]').simulate('click');
+      const alert = wrapper.update().find('Alert');
+      alert.find('button[aria-label="confirm-delete"]').simulate('click');
+      expect(wrapper.state().warningTitle).not.toBe(null);
+      expect(wrapper.state().warningMsg).not.toBe(null);
+      expected.forEach(criteria => {
+        for (const prop in criteria) {
+          expect(wrapper.state()[prop]).toEqual(criteria[prop]);
+        }
+      })
+      done();
+    });
+  });
 });
diff --git a/__tests__/pages/Organizations/screens/Organization/OrganizationAccess.test.jsx b/__tests__/pages/Organizations/screens/Organization/OrganizationAccess.test.jsx
index 3ba80d596f..915c077364 100644
--- a/__tests__/pages/Organizations/screens/Organization/OrganizationAccess.test.jsx
+++ b/__tests__/pages/Organizations/screens/Organization/OrganizationAccess.test.jsx
@@ -8,17 +8,13 @@ const mockAPIAccessList = {
   foo: 'bar',
 };
 
-const mockGetOrganzationAccessList = jest.fn(() => (
-  Promise.resolve(mockAPIAccessList)
-));
+const mockGetOrganzationAccessList = () => Promise.resolve(mockAPIAccessList);
 
 const mockResponse = {
   status: 'success',
 };
 
-const mockRemoveRole = jest.fn(() => (
-  Promise.resolve(mockResponse)
-));
+const mockRemoveRole = () => Promise.resolve(mockResponse);
 
 describe('<OrganizationAccess />', () => {
   test('initially renders succesfully', () => {
diff --git a/src/components/AccessList/Access.list.jsx b/src/components/AccessList/Access.list.jsx
index cb0e9a09f9..01b0f085b7 100644
--- a/src/components/AccessList/Access.list.jsx
+++ b/src/components/AccessList/Access.list.jsx
@@ -103,7 +103,7 @@ class AccessList extends React.Component {
     this.state = {
       page,
       page_size,
-      count: null,
+      count: 0,
       sortOrder: 'ascending',
       sortedColumnKey: 'username',
       isCompact: false,
@@ -193,7 +193,7 @@ class AccessList extends React.Component {
 
     try {
       const { data:
-        { count = null, results = null }
+        { count = 0, results = [] }
       } = await getAccessList(match.params.id, queryParams);
       const pageCount = Math.ceil(count / page_size);