diff --git a/src/components/Gradebook/GradebookFilters/AssignmentFilter/test.jsx b/src/components/Gradebook/GradebookFilters/AssignmentFilter/test.jsx
index a31a015..f6518f9 100644
--- a/src/components/Gradebook/GradebookFilters/AssignmentFilter/test.jsx
+++ b/src/components/Gradebook/GradebookFilters/AssignmentFilter/test.jsx
@@ -2,14 +2,18 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 
 import selectors from 'data/selectors';
-import { updateAssignmentFilter } from 'data/actions/filters';
-import { updateGradesIfAssignmentGradeFiltersSet } from 'data/actions/grades';
+import actions from 'data/actions';
+import { updateGradesIfAssignmentGradeFiltersSet } from 'data/thunkActions/grades';
 import {
   AssignmentFilter,
   mapStateToProps,
   mapDispatchToProps,
 } from '.';
 
+jest.mock('data/thunkActions/grades', () => ({
+  updateGradesIfAssignmentGradeFiltersSet: jest.fn(),
+}));
+
 jest.mock('data/selectors', () => ({
   /** Mocking to use passed state for validation purposes */
   filters: {
@@ -160,7 +164,7 @@ describe('AssignmentFilter', () => {
   describe('mapDispatchToProps', () => {
     test('updateAssignmentFilter', () => {
       expect(mapDispatchToProps.updateAssignmentFilter).toEqual(
-        updateAssignmentFilter,
+        actions.filters.update.assignment,
       );
     });
     test('updateGradesIfAsssignmentGradeFiltersSet', () => {
diff --git a/src/components/Gradebook/GradebookFilters/AssignmentGradeFilter/test.jsx b/src/components/Gradebook/GradebookFilters/AssignmentGradeFilter/test.jsx
index 95b728d..24a6de8 100644
--- a/src/components/Gradebook/GradebookFilters/AssignmentGradeFilter/test.jsx
+++ b/src/components/Gradebook/GradebookFilters/AssignmentGradeFilter/test.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 
-import { updateAssignmentLimits } from 'data/actions/filters';
-import { fetchGrades } from 'data/actions/grades';
+import actions from 'data/actions';
+import { fetchGrades } from 'data/thunkActions/grades';
 
 import {
   AssignmentGradeFilter,
@@ -167,7 +167,7 @@ describe('AssignmentGradeFilter', () => {
       expect(
         mapDispatchToProps.updateAssignmentLimits,
       ).toEqual(
-        updateAssignmentLimits,
+        actions.filters.update.assignmentLimits,
       );
     });
   });
diff --git a/src/components/Gradebook/GradebookFilters/AssignmentTypeFilter/index.jsx b/src/components/Gradebook/GradebookFilters/AssignmentTypeFilter/index.jsx
index 77de38c..25163c4 100644
--- a/src/components/Gradebook/GradebookFilters/AssignmentTypeFilter/index.jsx
+++ b/src/components/Gradebook/GradebookFilters/AssignmentTypeFilter/index.jsx
@@ -70,7 +70,6 @@ export const mapStateToProps = (state) => ({
   selectedAssignmentType: selectors.filters.assignmentType(state),
 });
 
-console.log({ actions });
 export const mapDispatchToProps = {
   filterAssignmentType: actions.filters.update.assignmentType,
 };
diff --git a/src/components/Gradebook/GradebookFilters/AssignmentTypeFilter/test.jsx b/src/components/Gradebook/GradebookFilters/AssignmentTypeFilter/test.jsx
index b755630..88750e0 100644
--- a/src/components/Gradebook/GradebookFilters/AssignmentTypeFilter/test.jsx
+++ b/src/components/Gradebook/GradebookFilters/AssignmentTypeFilter/test.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import selectors from 'data/selectors';
-import { filterAssignmentType } from 'data/actions/grades';
+import actions from 'data/actions';
 
 import {
   AssignmentTypeFilter,
@@ -128,7 +128,7 @@ describe('AssignmentTypeFilter', () => {
   describe('mapDispatchToProps', () => {
     test('filterAssignmentType', () => {
       expect(mapDispatchToProps.filterAssignmentType).toEqual(
-        filterAssignmentType,
+        actions.filters.update.assignmentType,
       );
     });
   });
diff --git a/src/components/Gradebook/GradebookFilters/CourseGradeFilter/test.jsx b/src/components/Gradebook/GradebookFilters/CourseGradeFilter/test.jsx
index ae038c4..d0e5475 100644
--- a/src/components/Gradebook/GradebookFilters/CourseGradeFilter/test.jsx
+++ b/src/components/Gradebook/GradebookFilters/CourseGradeFilter/test.jsx
@@ -3,8 +3,8 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { updateCourseGradeFilter } from 'data/actions/filters';
-import { fetchGrades } from 'data/actions/grades';
+import actions from 'data/actions';
+import { fetchGrades } from 'data/thunkActions/grades';
 import {
   CourseGradeFilter,
   mapStateToProps,
@@ -91,11 +91,11 @@ describe('CourseGradeFilter', () => {
           el.instance().updateCourseGradeFilters();
         });
         it('calls props.updateFilter with selection', () => {
-          expect(props.updateFilter).toHaveBeenCalledWith(
-            props.filterValues.courseGradeMin,
-            props.filterValues.courseGradeMax,
-            props.courseId,
-          );
+          expect(props.updateFilter).toHaveBeenCalledWith({
+            courseGradeMin: props.filterValues.courseGradeMin,
+            courseGradeMax: props.filterValues.courseGradeMax,
+            courseId: props.courseId,
+          });
         });
         it('calls props.getUserGrades with selection', () => {
           expect(props.getUserGrades).toHaveBeenCalledWith(
@@ -184,7 +184,7 @@ describe('CourseGradeFilter', () => {
   describe('mapDispatchToProps', () => {
     describe('updateFilter', () => {
       test('from updateCourseGradeFilter', () => {
-        expect(mapDispatchToProps.updateFilter).toEqual(updateCourseGradeFilter);
+        expect(mapDispatchToProps.updateFilter).toEqual(actions.filters.update.courseGradeLimits);
       });
     });
     describe('getUserGrades', () => {
diff --git a/src/components/Gradebook/GradebookFilters/StudentGroupsFilter/test.jsx b/src/components/Gradebook/GradebookFilters/StudentGroupsFilter/test.jsx
index 729c8d8..16a0655 100644
--- a/src/components/Gradebook/GradebookFilters/StudentGroupsFilter/test.jsx
+++ b/src/components/Gradebook/GradebookFilters/StudentGroupsFilter/test.jsx
@@ -3,7 +3,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { fetchGrades } from 'data/actions/grades';
+import { fetchGrades } from 'data/thunkActions/grades';
 import {
   StudentGroupsFilter,
   mapStateToProps,
diff --git a/src/components/Gradebook/GradebookFilters/test.jsx b/src/components/Gradebook/GradebookFilters/test.jsx
index dfa6d1a..d64aac1 100644
--- a/src/components/Gradebook/GradebookFilters/test.jsx
+++ b/src/components/Gradebook/GradebookFilters/test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { updateIncludeCourseRoleMembers } from 'data/actions/filters';
+import actions from 'data/actions';
 
 import {
   GradebookFilters,
@@ -98,7 +98,7 @@ describe('GradebookFilters', () => {
   describe('mapDispatchToProps', () => {
     test('updateIncludeCourseRoleMembers', () => {
       expect(mapDispatchToProps.updateIncludeCourseRoleMembers).toEqual(
-        updateIncludeCourseRoleMembers,
+        actions.filters.update.includeCourseRoleMembers,
       );
     });
   });
diff --git a/src/components/Gradebook/SearchControls.test.jsx b/src/components/Gradebook/SearchControls.test.jsx
index 94b655f..d56f11d 100644
--- a/src/components/Gradebook/SearchControls.test.jsx
+++ b/src/components/Gradebook/SearchControls.test.jsx
@@ -4,7 +4,7 @@ import { shallow } from 'enzyme';
 import {
   fetchGrades,
   fetchMatchingUserGrades,
-} from '../../data/actions/grades';
+} from '../../data/thunkActions/grades';
 import { mapDispatchToProps, mapStateToProps, SearchControls } from './SearchControls';
 
 jest.mock('@edx/paragon', () => ({
diff --git a/src/components/Gradebook/StatusAlerts.test.jsx b/src/components/Gradebook/StatusAlerts.test.jsx
index 0f80a5d..b5e9737 100644
--- a/src/components/Gradebook/StatusAlerts.test.jsx
+++ b/src/components/Gradebook/StatusAlerts.test.jsx
@@ -7,7 +7,7 @@ import {
   maxCourseGradeInvalidMessage,
   minCourseGradeInvalidMessage,
 } from './StatusAlerts';
-import { closeBanner } from '../../data/actions/grades';
+import actions from 'data/actions';
 
 jest.mock('@edx/paragon', () => ({
   StatusAlert: 'StatusAlert',
@@ -92,7 +92,7 @@ describe('StatusAlerts', () => {
       expect(
         mapDispatchToProps.handleCloseSuccessBanner,
       ).toEqual(
-        closeBanner,
+        actions.grades.banner.close,
       );
     });
   });
diff --git a/src/data/thunkActions/grades.test.js b/src/data/thunkActions/grades.test.js
index 9f29630..1a80b62 100644
--- a/src/data/thunkActions/grades.test.js
+++ b/src/data/thunkActions/grades.test.js
@@ -682,7 +682,7 @@ describe('grades thunkActions', () => {
     );
     const { csvUpload, uploadOverride } = actions.grades;
     describe('valid data', () => {
-      it('sends csvUpload finished and uploadOverride success actions', () =>  {
+      it('sends csvUpload finished and uploadOverride success actions', () => {
         testFetch(
           (resolve) => resolve(),
           [